diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts
index 89f4402c4..a8cf1ea07 100644
--- a/stores/SettingsStore.ts
+++ b/stores/SettingsStore.ts
@@ -742,7 +742,7 @@ export default class SettingsStore {
         },
         pos: {
             posEnabled: PosEnabled.Disabled,
-            squareEnabled: false,
+            squareEnabled: false, // deprecated
             squareAccessToken: '',
             squareLocationId: '',
             merchantName: '',
@@ -1050,12 +1050,9 @@ export default class SettingsStore {
                 }
 
                 // migrate old POS squareEnabled setting to posEnabled
-                if (!this.settings.pos.posEnabled) {
-                    if (this.settings.pos.squareEnabled) {
-                        this.settings.pos.posEnabled = PosEnabled.Square;
-                    } else {
-                        this.settings.pos.posEnabled = PosEnabled.Disabled;
-                    }
+                if (this.settings?.pos?.squareEnabled) {
+                    this.settings.pos.posEnabled = PosEnabled.Square;
+                    this.settings.pos.squareEnabled = false;
                 }
 
                 const node: any =