diff --git a/server/src/database/chat.ts b/server/src/database/chat.ts
index 2a1e8307..6fafc7ef 100644
--- a/server/src/database/chat.ts
+++ b/server/src/database/chat.ts
@@ -111,12 +111,20 @@ export async function getOverview(
       return overview;
     });
 
-    return Ok([
+    const overview = [
       ...matchingOverview,
       ...senderOverview,
       ...receiverOverview,
       ...shared,
-    ]);
+    ];
+
+    const sortedOverviewByTime = overview.sort((a, b) => {
+      const dateA = a.lastMsg?.createdAt ? a.lastMsg.createdAt.getTime() : 0;
+      const dateB = b.lastMsg?.createdAt ? b.lastMsg.createdAt.getTime() : 0;
+      return dateB - dateA;
+    });
+
+    return Ok([...sortedOverviewByTime]);
   } catch (e) {
     return Err(e);
   }