diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragment.kt
index 9b1adb083d0ba0c83ed8e4ae2686ca4e553be0d7..21f2176aa7bec6a2d92711b84829a42235e6cb90 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragment.kt
@@ -65,7 +65,7 @@ class WhitelistFragment : SettingsFragment(), SettingsFragment.Changeable,
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    handlerThread = HandlerThread("Crash")
+    handlerThread = HandlerThread("Whitelist")
     handlerThread.start()
     handler = Handler(handlerThread.looper)
   }
@@ -99,8 +99,10 @@ class WhitelistFragment : SettingsFragment(), SettingsFragment.Changeable,
         hostnameAdapter.list = it.hostnames
       }
 
-      certificateListEmpty.visibleIf(whitelist?.certificates.isNullOrEmpty())
-      hostnameListEmpty.visibleIf(whitelist?.hostnames.isNullOrEmpty())
+      activity?.runOnUiThread {
+        certificateListEmpty.visibleIf(whitelist?.certificates.isNullOrEmpty())
+        hostnameListEmpty.visibleIf(whitelist?.hostnames.isNullOrEmpty())
+      }
     }
     return view
   }