diff --git a/src/api/client_server/directory.rs b/src/api/client_server/directory.rs
index 52ac1b20..2d5172b2 100644
--- a/src/api/client_server/directory.rs
+++ b/src/api/client_server/directory.rs
@@ -247,7 +247,7 @@ pub(crate) async fn get_public_rooms_filtered_helper(
                                 Error::bad_database("Invalid room topic event in database.")
                             })
                     })
-                    .unwrap_or_default(),
+                    .unwrap_or(None),
                 world_readable: services()
                     .rooms
                     .state_accessor
diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces/mod.rs
index 4c763e86..677ba247 100644
--- a/src/service/rooms/spaces/mod.rs
+++ b/src/service/rooms/spaces/mod.rs
@@ -347,7 +347,7 @@ impl Service {
                             Error::bad_database("Invalid room topic event in database.")
                         })
                 })
-                .unwrap_or_default(),
+                .unwrap_or(None),
             world_readable: services()
                 .rooms
                 .state_accessor