diff --git a/packages/solid-query-devtools/src/__tests__/devtools.test.tsx b/packages/solid-query-devtools/src/__tests__/devtools.test.tsx
index d57141d8c3..5d197d7e75 100644
--- a/packages/solid-query-devtools/src/__tests__/devtools.test.tsx
+++ b/packages/solid-query-devtools/src/__tests__/devtools.test.tsx
@@ -151,4 +151,20 @@ describe('SolidQueryDevtools', () => {
 
     expect(unmount).toHaveBeenCalled()
   })
+
+  it('should return null in non-development environments', async () => {
+    vi.doMock('solid-js/web', async (importOriginal) => {
+      const actual = await importOriginal()
+      return Object.assign({}, actual, { isDev: false })
+    })
+    vi.resetModules()
+
+    try {
+      const { SolidQueryDevtools: ProductionDevtools } = await import('..')
+      expect(ProductionDevtools({})).toBeNull()
+    } finally {
+      vi.doUnmock('solid-js/web')
+      vi.resetModules()
+    }
+  })
 })
diff --git a/packages/solid-query-devtools/src/__tests__/devtoolsPanel.test.tsx b/packages/solid-query-devtools/src/__tests__/devtoolsPanel.test.tsx
index d5afd69805..76e5e30eea 100644
--- a/packages/solid-query-devtools/src/__tests__/devtoolsPanel.test.tsx
+++ b/packages/solid-query-devtools/src/__tests__/devtoolsPanel.test.tsx
@@ -164,4 +164,21 @@ describe('SolidQueryDevtoolsPanel', () => {
 
     expect(unmount).toHaveBeenCalled()
   })
+
+  it('should return null in non-development environments', async () => {
+    vi.doMock('solid-js/web', async (importOriginal) => {
+      const actual = await importOriginal()
+      return Object.assign({}, actual, { isDev: false })
+    })
+    vi.resetModules()
+
+    try {
+      const { SolidQueryDevtoolsPanel: ProductionDevtoolsPanel } =
+        await import('..')
+      expect(ProductionDevtoolsPanel({})).toBeNull()
+    } finally {
+      vi.doUnmock('solid-js/web')
+      vi.resetModules()
+    }
+  })
 })