diff --git a/dashboard/src/components/status/Shard.svelte b/dashboard/src/components/status/Shard.svelte
index b7851ec8..817d213e 100644
--- a/dashboard/src/components/status/Shard.svelte
+++ b/dashboard/src/components/status/Shard.svelte
@@ -25,12 +25,12 @@
 
 <div class="wrapper">
 	<div
-		class="shard" id={`shard-${shard.id.toString()}`}
+		class="shard" id={`shard-${shard.shard_id.toString()}`}
 		style={color}
-	>{ shard.id }</div>
-	<Tooltip target={`shard-${shard.id.toString()}`} placement="bottom">
+	>{ shard.shard_id }</div>
+	<Tooltip target={`shard-${shard.shard_id.toString()}`} placement="bottom">
 		<br>
-		<h3>Shard { shard.id }</h3>
+		<h3>Shard { shard.shard_id }</h3>
 		<br>
 		<span>Status: <b>{ shard.up ? "up" : "down" }</b></span><br>
 		<span>Latency: { shard.latency }ms</span><br>
diff --git a/dashboard/src/routes/Status/status.svelte b/dashboard/src/routes/Status/status.svelte
index 57568bb1..9f93ecf2 100644
--- a/dashboard/src/routes/Status/status.svelte
+++ b/dashboard/src/routes/Status/status.svelte
@@ -36,7 +36,7 @@
             return shard;
         });
 
-        if (data[0].cluster_id === 0) {
+        if (data[0].cluster_id !== undefined) {
             let clusterData = {};
             data.forEach(shard => {
                 if (clusterData[shard.cluster_id] === undefined) clusterData[shard.cluster_id] = [];
@@ -45,6 +45,8 @@
             clusters = clusterData;
         }
 
+        Object.keys(clusters).map(c => clusters[c] = clusters[c].reverse());
+
         shards = data;
         pingAverage = Math.trunc(latencies / shards.length).toString();
 
@@ -141,7 +143,7 @@
                                         {shardInfoMsg}
                                     {/if}
                                     {#if foundShard}
-                                        Your shard is: Shard { foundShard.id }
+                                        Your shard is: Shard { foundShard.shard_id }
                                     {/if}
                                 </CardTitle>
                             </CardHeader>
diff --git a/services/api/src/endpoints/private.rs b/services/api/src/endpoints/private.rs
index f274c89a..edf9fee2 100644
--- a/services/api/src/endpoints/private.rs
+++ b/services/api/src/endpoints/private.rs
@@ -23,7 +23,7 @@ pub async fn discord_state(State(ctx): State<ApiContext>) -> Json<Value> {
         .map(|v| serde_json::from_str(v).expect("could not deserialize shard"))
         .collect::<Vec<ShardState>>();
 
-    shard_status.sort_by(|a, b| a.shard_id.cmp(&b.shard_id));
+    shard_status.sort_by(|a, b| b.shard_id.cmp(&a.shard_id));
 
     Json(json!({
         "shards": shard_status,