diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index de72f20a..86b9222b 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -87,6 +87,11 @@
     "type": "text",
     "placeholders": {}
   },
+  "areYouSureYouWantToLogout": "Are you sure you want to log out?",
+  "@areYouSureYouWantToLogout": {
+    "type": "text",
+    "placeholders": {}
+  },
   "askSSSSCache": "Please enter your secure store passphrase or recovery key to cache the keys.",
   "@askSSSSCache": {
     "type": "text",
diff --git a/lib/views/home_view_parts/discover.dart b/lib/views/home_view_parts/discover.dart
index 9571b52d..47cffe5f 100644
--- a/lib/views/home_view_parts/discover.dart
+++ b/lib/views/home_view_parts/discover.dart
@@ -28,6 +28,7 @@ class Discover extends StatefulWidget {
 
 class _DiscoverState extends State<Discover> {
   Future<PublicRoomsResponse> _publicRoomsResponse;
+  String _lastServer;
   Timer _coolDown;
   String _genericSearchTerm;
 
@@ -117,6 +118,10 @@ class _DiscoverState extends State<Discover> {
     final server = _genericSearchTerm?.isValidMatrixId ?? false
         ? _genericSearchTerm.domain
         : widget.server;
+    if (_lastServer != server) {
+      _lastServer = server;
+      _publicRoomsResponse = null;
+    }
     _publicRoomsResponse ??= Matrix.of(context)
         .client
         .searchPublicRooms(
diff --git a/lib/views/home_view_parts/settings.dart b/lib/views/home_view_parts/settings.dart
index ddaca2b0..9c3c11f7 100644
--- a/lib/views/home_view_parts/settings.dart
+++ b/lib/views/home_view_parts/settings.dart
@@ -61,7 +61,7 @@ class _SettingsState extends State<Settings> {
   void logoutAction(BuildContext context) async {
     if (await showOkCancelAlertDialog(
           context: context,
-          title: L10n.of(context).areYouSure,
+          title: L10n.of(context).areYouSureYouWantToLogout,
         ) ==
         OkCancelResult.cancel) {
       return;