diff --git a/apps/dev-playground/package.json b/apps/dev-playground/package.json
index 1dc9358c5..ff34c03fa 100644
--- a/apps/dev-playground/package.json
+++ b/apps/dev-playground/package.json
@@ -5,8 +5,8 @@
   "scripts": {
     "start": "node build/index.mjs",
     "start:local": "NODE_ENV=production node --env-file=./server/.env build/index.mjs",
-    "dev": "NODE_ENV=development tsx watch server/index.ts",
-    "dev:inspect": "NODE_ENV=development tsx --inspect --tsconfig ./tsconfig.json ./server",
+    "dev": "NODE_ENV=development APPKIT_AUTO_RESOLVE_WAREHOUSE=1 tsx watch server/index.ts",
+    "dev:inspect": "NODE_ENV=development APPKIT_AUTO_RESOLVE_WAREHOUSE=1 tsx --inspect --tsconfig ./tsconfig.json ./server",
     "build": "npm run build:app",
     "build:app": "tsdown --out-dir build server/index.ts && cd client && npm run build",
     "build:server": "tsdown --out-dir build server/index.ts",
diff --git a/packages/appkit/src/context/service-context.ts b/packages/appkit/src/context/service-context.ts
index fa2f9c3ef..8eb3fbb3d 100644
--- a/packages/appkit/src/context/service-context.ts
+++ b/packages/appkit/src/context/service-context.ts
@@ -236,7 +236,11 @@ export class ServiceContext {
       return process.env.DATABRICKS_WAREHOUSE_ID;
     }
 
-    if (process.env.NODE_ENV === "development") {
+    const autoResolve =
+      process.env.APPKIT_AUTO_RESOLVE_WAREHOUSE === "true" ||
+      process.env.APPKIT_AUTO_RESOLVE_WAREHOUSE === "1";
+
+    if (process.env.NODE_ENV === "development" && autoResolve) {
       const response = (await client.apiClient.request({
         path: "/api/2.0/sql/warehouses",
         method: "GET",
diff --git a/packages/appkit/src/context/tests/service-context.test.ts b/packages/appkit/src/context/tests/service-context.test.ts
index 8e655721e..317ded38c 100644
--- a/packages/appkit/src/context/tests/service-context.test.ts
+++ b/packages/appkit/src/context/tests/service-context.test.ts
@@ -338,10 +338,25 @@ describe("ServiceContext", () => {
       expect(await state.warehouseId).toBe("env-wh-abc");
     });
 
-    test("should auto-discover warehouse in development mode", async () => {
+    test("should throw in dev mode when auto-resolve is not opted in", async () => {
       delete process.env.DATABRICKS_WAREHOUSE_ID;
+      delete process.env.APPKIT_AUTO_RESOLVE_WAREHOUSE;
       process.env.NODE_ENV = "development";
 
+      await expect(
+        ServiceContext.initialize({ warehouseId: true }),
+      ).rejects.toThrow(ConfigurationError);
+      // Must not attempt to list warehouses without explicit opt-in.
+      expect(mockApiRequest).not.toHaveBeenCalledWith(
+        expect.objectContaining({ path: "/api/2.0/sql/warehouses" }),
+      );
+    });
+
+    test("should auto-discover warehouse in dev mode when opted in", async () => {
+      delete process.env.DATABRICKS_WAREHOUSE_ID;
+      process.env.NODE_ENV = "development";
+      process.env.APPKIT_AUTO_RESOLVE_WAREHOUSE = "1";
+
       mockApiRequest.mockImplementation(({ path }: { path: string }) => {
         if (path === "/api/2.0/sql/warehouses") {
           return Promise.resolve({
@@ -365,6 +380,7 @@ describe("ServiceContext", () => {
     test("should sort warehouses by state priority in dev mode", async () => {
       delete process.env.DATABRICKS_WAREHOUSE_ID;
       process.env.NODE_ENV = "development";
+      process.env.APPKIT_AUTO_RESOLVE_WAREHOUSE = "1";
 
       mockApiRequest.mockImplementation(({ path }: { path: string }) => {
         if (path === "/api/2.0/sql/warehouses") {
@@ -388,6 +404,7 @@ describe("ServiceContext", () => {
     test("should throw in dev mode when no warehouses are available", async () => {
       delete process.env.DATABRICKS_WAREHOUSE_ID;
       process.env.NODE_ENV = "development";
+      process.env.APPKIT_AUTO_RESOLVE_WAREHOUSE = "1";
 
       mockApiRequest.mockImplementation(({ path }: { path: string }) => {
         if (path === "/api/2.0/sql/warehouses") {
@@ -404,6 +421,7 @@ describe("ServiceContext", () => {
     test("should throw in dev mode when all warehouses are deleted", async () => {
       delete process.env.DATABRICKS_WAREHOUSE_ID;
       process.env.NODE_ENV = "development";
+      process.env.APPKIT_AUTO_RESOLVE_WAREHOUSE = "1";
 
       mockApiRequest.mockImplementation(({ path }: { path: string }) => {
         if (path === "/api/2.0/sql/warehouses") {
@@ -425,6 +443,7 @@ describe("ServiceContext", () => {
     test("should throw in dev mode when best warehouse has no id", async () => {
       delete process.env.DATABRICKS_WAREHOUSE_ID;
       process.env.NODE_ENV = "development";
+      process.env.APPKIT_AUTO_RESOLVE_WAREHOUSE = "1";
 
       mockApiRequest.mockImplementation(({ path }: { path: string }) => {
         if (path === "/api/2.0/sql/warehouses") {