diff --git a/src/views/IdentitySwitcherView.vue b/src/views/IdentitySwitcherView.vue
index d008d4fd..75896a47 100644
--- a/src/views/IdentitySwitcherView.vue
+++ b/src/views/IdentitySwitcherView.vue
@@ -19,7 +19,7 @@
 
     <!-- Current Identity - Display First! -->
     <div
-      v-if="activeDid && !activeDidInIdentities"
+      v-if="hasCorruptedIdentity"
       class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-4"
     >
       <font-awesome
@@ -168,6 +168,14 @@ export default class IdentitySwitcherView extends Vue {
     return "flex flex-grow items-center bg-slate-100 rounded-md px-4 py-3 mb-2 truncate cursor-pointer";
   }
 
+  /**
+   * Detects if there's a data corruption issue with the active identity
+   * Shows warning when an identity is selected but not found in storage
+   */
+  get hasCorruptedIdentity(): boolean {
+    return Boolean(this.activeDid && !this.activeDidInIdentities);
+  }
+
   // =================================================
   // HELPER METHODS - Template Logic Streamlining
   // =================================================