diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
index ced52cb2..9cefb413 100644
--- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
+++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt
@@ -553,7 +553,6 @@ class ChatViewModel(
         ndrInviteRetries.cancelAll()
         geohashViewModel.shutdownUiSubscriptions()
         com.bitchat.android.services.AppStateStore.setSelectedPrivateChatPeer(null)
-        super.onCleared()
         // Note: Mesh service lifecycle is now managed by MainActivity
     }
     
diff --git a/app/src/main/java/com/bitchat/android/ui/GeohashViewModel.kt b/app/src/main/java/com/bitchat/android/ui/GeohashViewModel.kt
index 4b2b6254..e1c52770 100644
--- a/app/src/main/java/com/bitchat/android/ui/GeohashViewModel.kt
+++ b/app/src/main/java/com/bitchat/android/ui/GeohashViewModel.kt
@@ -424,7 +424,6 @@ class GeohashViewModel(
 
     override fun onCleared() {
         shutdownUiSubscriptions()
-        super.onCleared()
     }
 
     fun shutdownUiSubscriptions() {