diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
index 5c73ff88..5a467fbc 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
@@ -244,7 +244,6 @@ public abstract class AegisActivity extends AppCompatActivity implements VaultMa
         return !(this instanceof MainActivity)
                 && !(this instanceof AuthActivity)
                 && !(this instanceof IntroActivity)
-                && !(this instanceof TrashActivity)
                 && !_vaultManager.isVaultLoaded();
     }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java
index 2772898a..1edd443f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/TrashActivity.java
@@ -70,4 +70,10 @@ public class TrashActivity extends AegisActivity implements TrashEntryAdapter.Tr
             adapter.removeItem(entry);
         });
     }
+
+    @Override
+    public void onLocked(boolean userInitiated) {
+        // Do nothing. This will prevent the activity from being finished when the vault is locked.
+        // The onStart() method will handle the case where the vault is not loaded.
+    }
 }