From b7c7197f1dd4f6f258127ae9f357be8780d21cb6 Mon Sep 17 00:00:00 2001
From: benedikt-bartscher
 <31854409+benedikt-bartscher@users.noreply.github.com>
Date: Mon, 9 Sep 2024 04:10:46 +0200
Subject: [PATCH] fix initial state without cv fallback (#3670)

---
 reflex/compiler/utils.py | 4 +++-
 reflex/state.py          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/reflex/compiler/utils.py b/reflex/compiler/utils.py
index 1b69539ac..cbb402047 100644
--- a/reflex/compiler/utils.py
+++ b/reflex/compiler/utils.py
@@ -152,7 +152,9 @@ def compile_state(state: Type[BaseState]) -> dict:
         console.warn(
             f"Failed to compile initial state with computed vars, excluding them: {e}"
         )
-        initial_state = state(_reflex_internal_init=True).dict(include_computed=False)
+        initial_state = state(_reflex_internal_init=True).dict(
+            initial=True, include_computed=False
+        )
     return format.format_state(initial_state)
 
 
diff --git a/reflex/state.py b/reflex/state.py
index abf585513..cb18825c8 100644
--- a/reflex/state.py
+++ b/reflex/state.py
@@ -1784,7 +1784,7 @@ class BaseState(Base, ABC, extra=pydantic.Extra.allow):
             prop_name: self.get_value(getattr(self, prop_name))
             for prop_name in self.base_vars
         }
-        if initial:
+        if initial and include_computed:
             computed_vars = {
                 # Include initial computed vars.
                 prop_name: (