diff --git a/prodServer.ts b/prodServer.ts
index 2a1ebf7..af6b338 100644
--- a/prodServer.ts
+++ b/prodServer.ts
@@ -28,7 +28,7 @@ io.on('connection', async (socket) => {
         message: msg.content,
         imageSrc: sender.image,
         channel: msg.channel,
-        timestamp: timestamp.getTime(),
+        timestamp: timestamp,
       });
     }
   });
diff --git a/src/lib/components/message.svelte b/src/lib/components/message.svelte
index c180950..1bcf207 100644
--- a/src/lib/components/message.svelte
+++ b/src/lib/components/message.svelte
@@ -16,7 +16,7 @@
       <span class="font-bold">{user}</span>
       <span>·</span>
       <span class="text-muted-foreground"
-        >{new Date(timestamp).toLocaleDateString('en-US', {
+        >{timestamp.toLocaleDateString('en-US', {
           year: 'numeric',
           month: 'short',
           day: 'numeric',
diff --git a/src/lib/functions/clientWebsocket.svelte.ts b/src/lib/functions/clientWebsocket.svelte.ts
index dbeb397..db00da1 100644
--- a/src/lib/functions/clientWebsocket.svelte.ts
+++ b/src/lib/functions/clientWebsocket.svelte.ts
@@ -29,12 +29,13 @@ class Websocket {
 
   // Add message to local messages array
   private loadMessage(newMsg: TypeMessage) {
+    console.log(newMsg.timestamp);
     this.messages = [
       {
         message: newMsg.message,
         imageSrc: newMsg.imageSrc,
         user: newMsg.user,
-        timestamp: newMsg.timestamp,
+        timestamp: new Date(newMsg.timestamp),
       },
       ...this.messages,
     ];
diff --git a/src/lib/functions/websocketConfig.ts b/src/lib/functions/websocketConfig.ts
index ef53bf5..2c5f8a5 100644
--- a/src/lib/functions/websocketConfig.ts
+++ b/src/lib/functions/websocketConfig.ts
@@ -36,7 +36,7 @@ export function startupSocketIOServer(httpServer: HttpServer | null) {
           message: msg.content,
           imageSrc: sender.image,
           channel: msg.channel,
-          timestamp: timestamp.getTime(),
+          timestamp: timestamp,
         });
       }
     });
diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts
index a3c0a73..be675ba 100644
--- a/src/lib/server/db/index.ts
+++ b/src/lib/server/db/index.ts
@@ -6,12 +6,6 @@ interface Messages {
   error: Error | null;
 }
 
-interface CassandraTimestamp {
-  low: number;
-  high: number;
-  unsigned: boolean;
-}
-
 function createDelay(ms: number) {
   return new Promise((res) => setTimeout(res, ms));
 }
@@ -135,13 +129,6 @@ class Db {
       };
     }
   }
-
-  // Timestamp to Epoch method
-  tsEpoch(ts: CassandraTimestamp) {
-    const low = ts.low >>> 0;
-    const high = ts.high >>> 0;
-    return high * 2 ** 32 + low;
-  }
 }
 
 const db = new Db();
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index 8a348ff..63d4d9c 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -2,7 +2,7 @@ export interface TypeMessage {
   message: string;
   imageSrc: string;
   user: string;
-  timestamp: number;
+  timestamp: Date;
 }
 
 export interface TypeFullMessage {
@@ -10,5 +10,5 @@ export interface TypeFullMessage {
   message: string;
   imageSrc: string;
   user: string;
-  timestamp: number;
+  timestamp: Date;
 }
diff --git a/src/routes/(main)/channel/[channel]/+page.server.ts b/src/routes/(main)/channel/[channel]/+page.server.ts
index 11787d9..73e69e8 100644
--- a/src/routes/(main)/channel/[channel]/+page.server.ts
+++ b/src/routes/(main)/channel/[channel]/+page.server.ts
@@ -31,7 +31,7 @@ export async function load({ params, request }): Promise<ChannelLoad> {
             user: sender.username,
             imageSrc: sender.image,
             channel: value.channel,
-            timestamp: db.tsEpoch(value.timestamp),
+            timestamp: new Date(value.timestamp),
           };
         })
       : [];