diff --git a/CHANGELOG.md b/CHANGELOG.md
index 317e7a95c..0bbe354fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 - 'Draw over other apps' permission dialog opens when attempting to use Oreo Autofill
+- Old app shortcuts are now removed when the local repository is deleted
 
 ### Added
 - Completely revamped decypted password view
diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
index 04967c82d..cd01c8834 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
@@ -232,6 +232,11 @@ class UserPreference : AppCompatActivity() {
                             // TODO Handle the different cases of exceptions
                         }
 
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                            requireContext().getSystemService<ShortcutManager>()?.apply {
+                                removeDynamicShortcuts(dynamicShortcuts.map { it.id }.toMutableList())
+                            }
+                        }
                         sharedPreferences.edit { putBoolean("repository_initialized", false) }
                         dialogInterface.cancel()
                         callingActivity.finish()