diff --git a/bun.lockb b/bun.lockb
index a5ba6a2..4d64dc1 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts
index 59f740b..ecfa550 100644
--- a/src/lib/server/db/index.ts
+++ b/src/lib/server/db/index.ts
@@ -11,7 +11,7 @@ class Db {
   async createChannel(channelName: string) {
     try {
       await this.client.execute(`
-      CREATE TABLE IF NOT EXISTS channels.channel_${channelName} (
+      CREATE TABLE IF NOT EXISTS channels.${channelName} (
           id UUID,
           message_content TEXT,
           channel_name TEXT,
@@ -28,7 +28,7 @@ class Db {
   async sendMessage(channelName: string, content: string, sender: string, id: string) {
     try {
       const now = new Date();
-      await this.client.execute(`INSERT INTO channels.channel_${channelName} (id, message_content, channel_name, timestamp, sender)
+      await this.client.execute(`INSERT INTO channels.${channelName} (id, message_content, channel_name, timestamp, sender)
                    VALUES (${id}, '${content}', '${channelName}', ${now.getTime()}, ${sender})`);
     } catch (e) {
       console.log(`Error storing messages: ${e as Error}`);
@@ -50,7 +50,7 @@ class Db {
   async getMessages(channelName: string, limit: number): Promise<cassandra.types.Row[] | undefined> {
     try {
       const res = await this.client.execute(
-        `SELECT * FROM channels.channel_${channelName} WHERE channel_name = '${channelName}' ORDER BY timestamp DESC LIMIT ${limit}`,
+        `SELECT * FROM channels.${channelName} WHERE channel_name = '${channelName}' ORDER BY timestamp DESC LIMIT ${limit}`,
       );
       return res.rows;
     } catch (e) {
@@ -83,5 +83,6 @@ try {
 }
 
 const db = new Db(client);
+await db.createChannel('general');
 
 export { db };
diff --git a/src/lib/websocketConfig.ts b/src/lib/websocketConfig.ts
index 3dd9143..2759af0 100644
--- a/src/lib/websocketConfig.ts
+++ b/src/lib/websocketConfig.ts
@@ -21,8 +21,7 @@ export function startupSocketIOServer(httpServer: HttpServer | null) {
       if (msg.content !== '') {
         console.log(`[ws:kit] message from ${socket.id}: ${msg.content}`);
         // Store the message in the database
-        await db.createChannel('000');
-        await db.sendMessage('000', msg.content, msg.id, uuidv4());
+        await db.sendMessage('general', msg.content, msg.id, uuidv4());
         io!.emit('message', {
           user: msg.id,
           message: msg.content,