diff --git a/app/components/ui/CalculatorInput.tsx b/app/components/ui/CalculatorInput.tsx
index ca06b435..5a561985 100644
--- a/app/components/ui/CalculatorInput.tsx
+++ b/app/components/ui/CalculatorInput.tsx
@@ -22,8 +22,10 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 
+type View = "form" | "loading" | "dashboard";
+
 const CalculatorInput = () => {
-  const [view, setView] = useState("form");
+  const [view, setView] = useState<View>("form");
   const [data, setData] = useState<Household | null>(null);
 
   const searchParams = useSearchParams();
@@ -227,14 +229,18 @@ const CalculatorInput = () => {
         </Form>
       </div>
     );
-  } else if (view === "loading") {
+  }
+  
+  if (view === "loading") {
     return (
       <div className="flex items-center justify-center h-screen text-black mt-5">
         <ClipLoader color="black" size={50} />
       </div>
     );
-  } else if (view === "dashboard") {
-    return <Dashboard data={data as Household} />;
+  }
+  
+  if (view === "dashboard" && data) {
+    return <Dashboard data={data} />;
   }
 };