diff --git a/TODO.md b/TODO.md
index 538a8156..8c4aaca9 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,10 @@
 # TODO
 
+- keep scrollbars auto behavior?
+- improve auto completion delegate
+
 - refresh server list button
 - server list sorting method / explain what the % number is (stability)
-- spam alt+shift+a/going to room when starting app on server browser → segfault
 - login with account already added → infinite spinner in room list
 
 - global presence control
diff --git a/src/gui/Pages/AddAccount/ServerBrowser.qml b/src/gui/Pages/AddAccount/ServerBrowser.qml
index d637e5a9..b8967773 100644
--- a/src/gui/Pages/AddAccount/ServerBrowser.qml
+++ b/src/gui/Pages/AddAccount/ServerBrowser.qml
@@ -173,6 +173,9 @@ HBox {
 
     onAccepted: window.saveState(this)
 
+    Component.onDestruction:
+        if (fetchServersFuture) fetchServersFuture.cancel()
+
     Timer {
         id: connectTimeout
         interval: 30 * 1000