diff --git a/bin/light-base/src/runtime_service.rs b/bin/light-base/src/runtime_service.rs
index 9ba2d7097e..2acad4a4b1 100644
--- a/bin/light-base/src/runtime_service.rs
+++ b/bin/light-base/src/runtime_service.rs
@@ -1100,6 +1100,10 @@ async fn run_background<TPlat: Platform>(
                     }
                 }
 
+                if let GuardedInner::FinalizedBlockRuntimeUnknown { when_known, .. } = &lock.tree {
+                    when_known.notify(usize::max_value());
+                }
+
                 lock.tree = GuardedInner::FinalizedBlockRuntimeKnown {
                     all_blocks_subscriptions: hashbrown::HashMap::with_capacity_and_hasher(
                         32,
diff --git a/bin/wasm-node/CHANGELOG.md b/bin/wasm-node/CHANGELOG.md
index 3dc876da87..ac2cbd89a7 100644
--- a/bin/wasm-node/CHANGELOG.md
+++ b/bin/wasm-node/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixed
+
+- Fix regression introduced in version 0.6.11 causing some JSON-RPC functions to never produce a result if they were sent before the runtime of the chain has been downloaded. ([#2201](https://github.com/paritytech/smoldot/pull/2201))
+
 ## 0.6.11 - 2022-03-31
 
 ### Fixed