diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java b/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
index 0ea114754..9df5c21c4 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
+++ b/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
@@ -113,6 +113,8 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
     }
 
     public void forceUpdateKeyboardTheme(@NonNull Context displayContext) {
+        Settings settings = Settings.getInstance();
+        settings.loadSettings(displayContext, settings.getCurrent().mLocale, settings.getCurrent().mInputAttributes);
         mLatinIME.setInputView(onCreateInputView(displayContext, mIsHardwareAcceleratedDrawingEnabled));
     }
 
diff --git a/app/src/main/java/helium314/keyboard/latin/LatinIME.java b/app/src/main/java/helium314/keyboard/latin/LatinIME.java
index 77534fb2e..40e107696 100644
--- a/app/src/main/java/helium314/keyboard/latin/LatinIME.java
+++ b/app/src/main/java/helium314/keyboard/latin/LatinIME.java
@@ -1983,7 +1983,6 @@ public class LatinIME extends InputMethodService implements
     private void reloadIfNecessary() {
         // better do the reload when showing the keyboard next time, and not on settings change
         if (SettingsActivityKt.keyboardNeedsReload) {
-            loadSettings();
             KeyboardLayoutSet.onKeyboardThemeChanged();
             mKeyboardSwitcher.forceUpdateKeyboardTheme(mDisplayContext);
             SettingsActivityKt.keyboardNeedsReload = false;