diff --git a/lib/encryption/key_manager.dart b/lib/encryption/key_manager.dart
index 86d93e18..6133d91d 100644
--- a/lib/encryption/key_manager.dart
+++ b/lib/encryption/key_manager.dart
@@ -157,6 +157,9 @@ class KeyManager {
       json.encode(senderClaimedKeys),
     )
         ?.then((_) {
+      if (!client.isLogged() || client.encryption == null) {
+        return;
+      }
       if (uploaded) {
         client.database
             .markInboundGroupSessionAsUploaded(client.id, roomId, sessionId);