diff --git a/src/useRXQuery.ts b/src/useRXQuery.ts
index 7556510..ee8cd4b 100644
--- a/src/useRXQuery.ts
+++ b/src/useRXQuery.ts
@@ -27,8 +27,6 @@ export const useRXQuery = <DATA>(
   const [data, setData] = useState(
     getInitQueryResponse<DATA | undefined>(initialState),
   );
-  const [isInitValue, setIsInitValue] = useState(true);
-  const subscriberRef = useRef<Subscription>();
   const queryHandler = useCallback(
     (
       query: (
@@ -40,34 +38,22 @@ export const useRXQuery = <DATA>(
 
       const observable$ = query(configs);
       subscriberRef.current = observable$.subscribe((subscribedData) => {
-        if (isInitValue) {
-          setIsInitValue(false);
-        }
         setData(subscribedData);
       });
     },
     [!!query],
   );
+  const subscriberRef = useRef<Subscription>();
 
   function usnsubscribe() {
     subscriberRef.current?.unsubscribe();
   }
 
-  // Handle query method
   useEffect(() => {
     if (!query) return usnsubscribe;
     queryHandler(query);
-
-    if (isInitValue) return usnsubscribe;
-
     return usnsubscribe;
-  }, [!!query]);
-
-  // Handle recal query
-  useEffect(() => {
-    if (!keysToRecallQuery || !query) return;
-    queryHandler(query);
-  }, [JSON.stringify(keysToRecallQuery)]);
+  }, [JSON.stringify(keysToRecallQuery), !!query]);
 
   return data;
 };