diff --git a/src/Cache_p.h b/src/Cache_p.h
index 40ce6e5c..7b3bf8b0 100644
--- a/src/Cache_p.h
+++ b/src/Cache_p.h
@@ -410,8 +410,10 @@ private:
                 break;
             }
             }
-            // fallthrough to also store it as state event to eventually migrate away from a
-            // separate members db.
+
+            // BUG(Nico): Ideally we would fall through and store this in the database, but it seems
+            // to currently corrupt the db sometimes, so... let's find that bug first!
+            return;
         } else if (std::holds_alternative<StateEvent<Encryption>>(event)) {
             setEncryptedRoom(txn, room_id);
             return;