diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index 161e722bf5..67b544ed75 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -224,6 +224,11 @@ class MainApp : DaggerApplication() {
             sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_log_app_started_event, config.APS)
         if (sp.getString(info.nightscout.configuration.R.string.key_maintenance_logs_email, "") == "logs@androidaps.org")
             sp.putString(info.nightscout.configuration.R.string.key_maintenance_logs_email, "logs@aaps.app")
+        // fix values for theme switching
+        sp.putString(info.nightscout.plugins.R.string.value_dark_theme, "dark")
+        sp.putString(info.nightscout.plugins.R.string.value_light_theme, "light")
+        sp.putString(info.nightscout.plugins.R.string.value_system_theme, "system")
+
     }
 
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {