diff --git a/packages/cli/src/lib/dev-shared.ts b/packages/cli/src/lib/dev-shared.ts
index 9e54e0fd07..ae29b4f852 100644
--- a/packages/cli/src/lib/dev-shared.ts
+++ b/packages/cli/src/lib/dev-shared.ts
@@ -18,9 +18,10 @@ import {getGraphiQLUrl} from './graphiql-url.js';
 
 export function isMockShop(envVariables: Record<string, string>) {
   return (
-    // We fallback to mock.shop if the env var is not set
-    !envVariables.PUBLIC_STORE_DOMAIN ||
-    envVariables.PUBLIC_STORE_DOMAIN === 'mock.shop'
+    envVariables.PUBLIC_STORE_DOMAIN === 'mock.shop' ||
+    // We fallback to mock.shop if the env var is falsy.
+    // When it's undefined, it might be overwritten by remote variables.
+    envVariables.PUBLIC_STORE_DOMAIN === ''
   );
 }