diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts
index 120b67dd97..bfbbbf34c9 100644
--- a/packages/solid-query/src/createBaseQuery.ts
+++ b/packages/solid-query/src/createBaseQuery.ts
@@ -132,7 +132,6 @@ export function createBaseQuery<
     defaultOptions.structuralSharing = false
     if (isServer) {
       defaultOptions.retry = false
-      defaultOptions.throwOnError = true
     }
     return defaultOptions
   })
@@ -157,7 +156,13 @@ export function createBaseQuery<
         const query = observer().getCurrentQuery()
         const unwrappedResult = hydratableObserverResult(query, result)
 
-        if (unwrappedResult.isError) {
+        if (
+          unwrappedResult.isError &&
+          shouldThrowError(initialOptions.throwOnError, [
+            unwrappedResult.error,
+            query,
+          ])
+        ) {
           reject(unwrappedResult.error)
           unsubscribeIfQueued()
         } else {