diff --git a/app/src/main/kotlin/me/eternal/purrfectsnap/bridge/BridgeService.kt b/app/src/main/kotlin/me/eternal/purrfectsnap/bridge/BridgeService.kt
index 9d56d813..83b87b4d 100644
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/bridge/BridgeService.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/bridge/BridgeService.kt
@@ -229,7 +229,6 @@ class BridgeService : Service() {
             pendingSocialSnapshotCallback?.let { callback ->
                 pendingSocialSnapshotCallback = null
                 callback(parsedFriends, parsedGroups)
-                return
             }
             remoteSideContext.database.replaceMessagingData(parsedFriends, parsedGroups)
             remoteSideContext.database.receiveMessagingDataCallback(parsedFriends, parsedGroups)
diff --git a/app/src/main/kotlin/me/eternal/purrfectsnap/storage/Messaging.kt b/app/src/main/kotlin/me/eternal/purrfectsnap/storage/Messaging.kt
index 020c4f21..703a548f 100644
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/storage/Messaging.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/storage/Messaging.kt
@@ -138,6 +138,11 @@ fun AppDatabase.replaceMessagingData(
         } finally {
             database.endTransaction()
         }
+        
+        // Notify with the full updated list from the DB
+        val allFriends = getFriends(descOrder = true)
+        val allGroups = getGroups()
+        receiveMessagingDataCallback(allFriends, allGroups)
     }
 }
 
diff --git a/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/social/AddFriendDialog.kt b/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/social/AddFriendDialog.kt
index dd7920e4..678d3047 100644
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/social/AddFriendDialog.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/social/AddFriendDialog.kt
@@ -256,11 +256,7 @@ class AddFriendDialog(
                 )
             }
 
-            if (context.bridgeService != null) {
-                context.bridgeService?.requestEphemeralSocialSnapshot(updateSnapshot)
-            } else {
-                context.database.receiveMessagingDataCallback = updateSnapshot
-            }
+            context.database.receiveMessagingDataCallback = updateSnapshot
             context.requestSocialSnapshotRefresh()
 
             coroutineScope.launch(Dispatchers.IO) {