diff --git a/src/node_modules/@internal/gql-query/browser.marko b/src/node_modules/@internal/gql-query/browser.marko
index a2e90ae..9d5646e 100644
--- a/src/node_modules/@internal/gql-query/browser.marko
+++ b/src/node_modules/@internal/gql-query/browser.marko
@@ -1,5 +1,10 @@
 import { readyLookup } from "@internal/client";
 
+$ const id = component.elId("@gqlc");
+$ if (readyLookup[id]) {
+  component.ready = true;
+  readyLookup[id]();
+}
 <div key="root" no-update-if(!component.ready)>
   $ component.ready = true;
   <gql-query-client
@@ -14,7 +19,6 @@ import { readyLookup } from "@internal/client";
   />
 </div>
 $ if (!component.ready) {
-  const id = component.elId("@gqlc");
   readyLookup[id] = () => {
     delete readyLookup[id];
     component.ready = true;
diff --git a/src/node_modules/@internal/gql-query/components/gql-query-client/index.marko b/src/node_modules/@internal/gql-query/components/gql-query-client/index.marko
index 05791fe..ada90b4 100644
--- a/src/node_modules/@internal/gql-query/components/gql-query-client/index.marko
+++ b/src/node_modules/@internal/gql-query/components/gql-query-client/index.marko
@@ -19,18 +19,15 @@ class {
         }
       } else if (input.opKey) {
         this.setInput(input);
-        const hydrate = (ready) => {
-          hydrateQuery(input.opKey, data, error, input.name);
-          ready();
-        }
 
         if (readyLookup[this.id]) {
-          hydrate(readyLookup[this.id]);
+          hydrateQuery(input.opKey, data, error, input.name);
+          readyLookup[this.id]();
         } else {
-          Object.defineProperty(readyLookup, this.id, {
-            configurable: true,
-            set: hydrate
-          });
+          readyLookup[this.id] = () => {
+            delete readyLookup[this.id];
+            hydrateQuery(input.opKey, data, error, input.name);
+          }
         }
       }
     }