diff --git a/CHANGELOG.md b/CHANGELOG.md
index 601b6bf..1744109 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [17.3.1-next.1](https://github.com/SaulMoro/ngrx-rtk-query/compare/v17.3.0...v17.3.1-next.1) (2024-03-12)
+
+
+### Bug Fixes
+
+* problem with lazy signal in edge cases ([5d3324f](https://github.com/SaulMoro/ngrx-rtk-query/commit/5d3324ff60900ec7b9442ced35ef44531b444d6d))
+
 # [17.3.0](https://github.com/SaulMoro/ngrx-rtk-query/compare/v17.2.1...v17.3.0) (2024-03-12)
 
 
diff --git a/README.md b/README.md
index 92c8980..aecdafa 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ npm install ngrx-rtk-query
 | :----------------: | :--------------------: | :--------------: | :-----------------: |
 |        17.x        |   >=17.3.x (signals)   |     ~2.2.1       | Bugs / New Features |
 |        17.x        |   >=17.1.x (signals)   |     ~2.2.1       |        Bugs         |
-|        16.x        |    >=4.2.x (rxjs)      |     ~1.9.5       |    Critical bugs    |
-|        15.x        |      4.1.x (rxjs)      |      1.9.5       |        None         |
+|        16.x        |    >=4.2.x (rxjs)      |     ~1.9.3       |    Critical bugs    |
+|        15.x        |      4.1.x (rxjs)      |      1.9.3       |        None         |
 
 Only the latest version of Angular in the table above is actively supported. This is due to the fact that compilation of Angular libraries is [incompatible between major versions](https://angular.io/guide/creating-libraries#ensuring-library-version-compatibility).
 
diff --git a/projects/ngrx-rtk-query/src/lib/build-hooks.ts b/projects/ngrx-rtk-query/src/lib/build-hooks.ts
index 1e77340..fd56a13 100644
--- a/projects/ngrx-rtk-query/src/lib/build-hooks.ts
+++ b/projects/ngrx-rtk-query/src/lib/build-hooks.ts
@@ -344,7 +344,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     const useQueryState: UseQueryState<any> = (arg: any, options = {}) => {
       // We need to use `toLazySignal` here to prevent 'signal required inputs' errors
       const lazyArg = isSignal(arg)
-        ? toLazySignal(arg, { initialValue: skipToken })
+        ? toLazySignal(arg, { initialValue: undefined })
         : typeof arg === 'function'
           ? arg
           : () => arg;