diff --git a/src/app/context/api/VersionInfo.tsx b/src/app/context/api/VersionInfo.tsx
index 91b3f735..75a5d1cd 100644
--- a/src/app/context/api/VersionInfo.tsx
+++ b/src/app/context/api/VersionInfo.tsx
@@ -37,7 +37,13 @@ export function VersionInfoProvider({ children }: PropsWithChildren) {
   } = useBTCTipHeight();
 
   const context = useMemo(() => {
-    if (!versions || !height) return;
+    if (!versions || !height)
+      return {
+        isApprochingNextVersion: false,
+        firstActivationHeight: 0,
+        isError: isHeightError || isVersionError,
+        isLoading: isVersionLoading || isHeightLoading,
+      };
 
     return {
       currentHeight: height,