diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 8556477..983ba80 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -20,7 +20,7 @@ export default function RootLayout({
       isClient: typeof window !== "undefined"
     });
     const client = createClient({
-      url: process.env.NEXT_PUBLIC_GRAPHQL_URL || "",
+      url: "/api/graphql",
       exchanges: [cacheExchange, ssr, fetchExchange],
       suspense: true
     });
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 84b898e..4c98e94 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -148,7 +148,7 @@ export default function Home() {
             </VStack>
           </VStack>
           <VStack gap={10} w="100%">
-            {totalGroups && (
+            {totalGroups ? (
               <StatsList
                 title="Total Stats"
                 loading={totalStatsFetching || totalGroupsFetching}
@@ -158,8 +158,18 @@ export default function Home() {
                 commands={totalStats.getTotalStats.commandResponses}
                 triggers={totalStats.getTotalStats.timesTriggered}
               />
+            ) : (
+              <StatsList
+                title="Total Stats"
+                loading={totalStatsFetching || totalGroupsFetching}
+                error={totalStatsError || totalGroupsError}
+                groups={0}
+                links={0}
+                commands={0}
+                triggers={0}
+              />
             )}
-            {todayStats && (
+            {todayStats ? (
               <StatsList
                 title="Today's Stats"
                 loading={todaysStatsFetching}
@@ -168,6 +178,15 @@ export default function Home() {
                 commands={todayStats.getTodayStats.commandResponses}
                 triggers={todayStats.getTodayStats.timesTriggered}
               />
+            ) : (
+              <StatsList
+                title="Today's Stats"
+                loading={todaysStatsFetching}
+                error={todaysStatsError}
+                links={0}
+                commands={0}
+                triggers={0}
+              />
             )}
           </VStack>
           <VStack w="95%" gap="5vh">
diff --git a/src/components/charts/LineChart.tsx b/src/components/charts/LineChart.tsx
index 4cabc1e..8bad303 100644
--- a/src/components/charts/LineChart.tsx
+++ b/src/components/charts/LineChart.tsx
@@ -32,7 +32,7 @@ const LineChartComponent = ({
           axisLine={false}
           dataKey={chart.key("day")}
           stroke={chart.color("border")}
-        // label={{ value: "Day", position: "bottom" }}
+          // label={{ value: "Day", position: "bottom" }}
         />
         <YAxis
           width="auto"
@@ -40,7 +40,7 @@ const LineChartComponent = ({
           tickLine={false}
           tickMargin={10}
           stroke={chart.color("border")}
-        // label={{ value: label, position: "left", angle: -90 }}
+          // label={{ value: label, position: "left", angle: -90 }}
         />
         <Tooltip
           animationDuration={100}