diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
index 103e0dfe..9e506bc2 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
@@ -828,7 +828,9 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
 
                 // remove the old master password slot
                 PasswordSlot oldSlot = creds.getSlots().find(PasswordSlot.class);
-                slots.remove(oldSlot);
+                if (oldSlot != null) {
+                    slots.remove(oldSlot);
+                }
 
                 // add the new master password slot
                 slots.add(slot);