diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index 6d22454926..161e722bf5 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -42,6 +42,7 @@ import info.nightscout.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import info.nightscout.shared.extensions.runOnUiThread
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
@@ -106,7 +107,7 @@ class MainApp : DaggerApplication() {
             }
             disposable += compatDBHelper.dbChangeDisposable()
             registerActivityLifecycleCallbacks(activityMonitor)
-            profileSwitchPlugin.setThemeMode()
+            runOnUiThread { profileSwitchPlugin.setThemeMode() }
             aapsLogger.debug("Version: " + BuildConfig.VERSION_NAME)
             aapsLogger.debug("BuildVersion: " + BuildConfig.BUILDVERSION)
             aapsLogger.debug("Remote: " + BuildConfig.REMOTE)