diff --git a/CHANGELOG.md b/CHANGELOG.md
index d553a1ff..fda05492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [0.9.3] - 11th May 2022
+- fix: Missing null check in get single room method 
+
 ## [0.9.2] - 10th May 2022
 - chore: Make path configurable in uiaLogin
 
diff --git a/lib/src/database/fluffybox_database.dart b/lib/src/database/fluffybox_database.dart
index d5bb3084..b80c34fa 100644
--- a/lib/src/database/fluffybox_database.dart
+++ b/lib/src/database/fluffybox_database.dart
@@ -475,7 +475,7 @@ class FluffyBoxDatabase extends DatabaseApi {
           .toList();
       final rawStates = await _roomStateBox.getAll(dbKeys);
       for (final rawState in rawStates) {
-        if (rawState == null) continue;
+        if (rawState == null || rawState[''] == null) continue;
         room.setState(Event.fromJson(copyMap(rawState['']), room));
       }
     }
diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
index 26eec73a..69332464 100644
--- a/lib/src/database/hive_database.dart
+++ b/lib/src/database/hive_database.dart
@@ -522,7 +522,7 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
     // Get raw room from database:
     final roomData = await _roomsBox.get(roomId);
     if (roomData == null) return null;
-    final room = Room.fromJson(copyMap(roomData), client);
+    final room = Room.fromJson(convertToJson(roomData), client);
 
     // Get important states:
     if (loadImportantStates) {
@@ -533,8 +533,8 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
         dbKeys.map((key) => _roomStateBox.get(key)),
       );
       for (final rawState in rawStates) {
-        if (rawState == null) continue;
-        room.setState(Event.fromJson(copyMap(rawState['']), room));
+        if (rawState == null || rawState[''] == null) continue;
+        room.setState(Event.fromJson(convertToJson(rawState['']), room));
       }
     }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 285e2725..8ff1a4e0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: matrix
 description: Matrix Dart SDK
-version: 0.9.2
+version: 0.9.3
 homepage: https://famedly.com
 repository: https://gitlab.com/famedly/company/frontend/famedlysdk.git