diff --git a/reflex/vars/base.py b/reflex/vars/base.py
index 4feca42a9..82b169db4 100644
--- a/reflex/vars/base.py
+++ b/reflex/vars/base.py
@@ -218,9 +218,7 @@ class VarData:
             position: Position of the hook in the component.
         """
         immutable_imports: ImmutableParsedImportDict = tuple(
-            sorted(
-                ((k, tuple(sorted(v))) for k, v in parse_imports(imports or {}).items())
-            )
+            (k, tuple(v)) for k, v in parse_imports(imports or {}).items()
         )
         object.__setattr__(self, "state", state)
         object.__setattr__(self, "field_name", field_name)
diff --git a/reflex/vars/number.py b/reflex/vars/number.py
index fa549b3b3..ee1bb4f7f 100644
--- a/reflex/vars/number.py
+++ b/reflex/vars/number.py
@@ -1140,9 +1140,9 @@ class MatchOperation(CachedVarOperation, Var[VAR_TYPE]):
         return VarData.merge(
             self._cond._get_all_var_data(),
             *(
-                case._get_all_var_data()
-                for cond_or_return in self._cases
-                for case in cond_or_return
+                cond_or_return._get_all_var_data()
+                for case in self._cases
+                for cond_or_return in case
             ),
             self._default._get_all_var_data(),
             self._var_data,