diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7049eb4..b0ac08c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ Procedure when bumping the version number:
 ## Unreleased
 
 ### Fixed
+- Joining new rooms no longer crashes cove
 - Scrolling when exiting message editor
 
 ## v0.2.0 - 2022-08-10
diff --git a/src/vault/euph.rs b/src/vault/euph.rs
index 2ffd36c..531aa74 100644
--- a/src/vault/euph.rs
+++ b/src/vault/euph.rs
@@ -1219,7 +1219,9 @@ impl EuphRequest {
                 WHERE room = ?
                 ",
             )?
-            .query_row(params![room], |row| row.get(0))?;
+            .query_row(params![room], |row| row.get(0))
+            .optional()?
+            .unwrap_or(0);
         let _ = result.send(amount);
         Ok(())
     }