diff --git a/src/components/molecules/Dashboard.tsx b/src/components/molecules/Dashboard.tsx
index 0822fb6..3f90f4c 100644
--- a/src/components/molecules/Dashboard.tsx
+++ b/src/components/molecules/Dashboard.tsx
@@ -268,6 +268,8 @@ function Analytics() {
       </div>
     );
 
+    if (!analytics) return <IncomingFeature />
+
   return (
     <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
       <MetricCard
@@ -361,38 +363,6 @@ function Analytics() {
         description="Last 30 days"
         icon="data"
       />
-      {/* <Card>
-        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-          <CardTitle className="text-sm font-medium">Subscriptions</CardTitle>
-          <UsersRound className="w-4 h-4 text-muted-foreground" />
-        </CardHeader>
-        <CardContent>
-          <div className="text-2xl font-bold">+2350</div>
-          <p className="text-xs text-muted-foreground">
-            +180.1% from last month
-          </p>
-        </CardContent>
-      </Card>
-      <Card>
-        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-          <CardTitle className="text-sm font-medium">Active Now</CardTitle>
-          <Activity className="h-4 w-4 text-muted-foreground" />
-        </CardHeader>
-        <CardContent>
-          <div className="text-2xl font-bold">+573</div>
-          <p className="text-xs text-muted-foreground">+201 since last hour</p>
-        </CardContent>
-      </Card>
-      <Card>
-        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-          <CardTitle className="text-sm font-medium">Active Now</CardTitle>
-          <Activity className="h-4 w-4 text-muted-foreground" />
-        </CardHeader>
-        <CardContent>
-          <div className="text-2xl font-bold">+573</div>
-          <p className="text-xs text-muted-foreground">+201 since last hour</p>
-        </CardContent>
-      </Card> */}
     </div>
   );
 }
diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts
index 299f8b9..15d7a88 100644
--- a/src/lib/api/index.ts
+++ b/src/lib/api/index.ts
@@ -256,24 +256,24 @@ export const getAnalytics = queryOptions({
       credentials: "include",
     });
     const json = (await response.json()) as ApiResponse<Analytics>;
-    return {
-      "newUsersInLast30Days": 5,
-      "newUsersInLast7Days": 2,
-      "newUsersToday": 0,
-      "newNodesInLast30Days": 2292,
-      "newNodesInLast7Days": 454,
-      "newNodesToday": 0,
-      "activeUsersToday": 1,
-      "activeUsersInLast7Days": 11,
-      "activeUsersInLast30Days": 17,
-      "nodeViewsToday": 2,
-      "nodeViewsInLast7Days": 3485,
-      "nodeViewsInLast30Days": 14245,
-      "bytesToday": null,
-      "bytesInLast7Days": 22890864,
-      "bytesInLast30Days": 77358695
-    }
-    // return json.data ?? null;
+    // return {
+    //   "newUsersInLast30Days": 5,
+    //   "newUsersInLast7Days": 2,
+    //   "newUsersToday": 0,
+    //   "newNodesInLast30Days": 2292,
+    //   "newNodesInLast7Days": 454,
+    //   "newNodesToday": 0,
+    //   "activeUsersToday": 1,
+    //   "activeUsersInLast7Days": 11,
+    //   "activeUsersInLast30Days": 17,
+    //   "nodeViewsToday": 2,
+    //   "nodeViewsInLast7Days": 3485,
+    //   "nodeViewsInLast30Days": 14245,
+    //   "bytesToday": null,
+    //   "bytesInLast7Days": 22890864,
+    //   "bytesInLast30Days": 77358695
+    // }
+    return json.data ?? null;
   },
   staleTime: 60 * 1000
 });