diff --git a/lib/src/client.dart b/lib/src/client.dart
index 01c57a72..9a31700a 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -137,7 +137,7 @@ class Client extends MatrixApi {
   /// [wellKnown] cache will be invalidated.
   @override
   set homeserver(Uri? homeserver) {
-    if (homeserver?.host != this.homeserver?.host) {
+    if (this.homeserver != null && homeserver?.host != this.homeserver?.host) {
       _wellKnown = null;
       unawaited(database?.storeWellKnown(null));
     }