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 4bc6d858cbd281fc7aa9b6a4a6c28e9662f42f20..5a1447b44759e4b7fdd80c9aab7e1ee0930a1568 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
@@ -109,8 +109,10 @@ class WhitelistFragment : SettingsFragment(), Changeable,
     handler.post {
       whitelist = Whitelist(database.validityWhitelist().all(), database.hostnameWhitelist().all())
       whitelist?.let {
-        certificateAdapter.list = it.certificates
-        hostnameAdapter.list = it.hostnames
+        activity?.runOnUiThread {
+          certificateAdapter.list = it.certificates
+          hostnameAdapter.list = it.hostnames
+        }
       }
     }
     return view