diff --git a/backend/main.go b/backend/main.go
index 9df8678..a4801b5 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -15,7 +15,7 @@ import (
 
 func main() {
 	logsDir := "/backend/logs"
-	logFile, err := os.OpenFile(logsDir+"/go.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	logFile, err := os.OpenFile(logsDir+"/go.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		panic(err)
 	}
diff --git a/backend/services/websocket.go b/backend/services/websocket.go
index c626867..4c123ee 100644
--- a/backend/services/websocket.go
+++ b/backend/services/websocket.go
@@ -1,6 +1,7 @@
 package services
 
 import (
+	"net/http"
 	"sync"
 	"time"
 
@@ -12,6 +13,9 @@ import (
 var Upgrader = websocket.Upgrader{
 	ReadBufferSize:  1024,
 	WriteBufferSize: 1024,
+	CheckOrigin: func(r *http.Request) bool {
+		return true
+	},
 }
 
 var (
diff --git a/nginx/vue/src/components/util/Chat.vue b/nginx/vue/src/components/util/Chat.vue
index 4ee525f..d5383f6 100644
--- a/nginx/vue/src/components/util/Chat.vue
+++ b/nginx/vue/src/components/util/Chat.vue
@@ -1,9 +1,18 @@
 <script setup>
+import { ref, computed, onMounted, onUnmounted } from "vue";
 import Button from "@/components/input/Button.vue";
 import { useMessagesStore } from "@/stores/messages";
 
 const messagesStore = useMessagesStore();
 const messages = computed(() => messagesStore.messages);
+const messageInput = ref("");
+
+function sendMessage() {
+    const text = messageInput.value.trim();
+    if (!text) return;
+    messagesStore.sendMessage(text);
+    messageInput.value = "";
+}
 
 onMounted(() => {
     messagesStore.connect();
@@ -17,7 +26,7 @@ onUnmounted(() => {
     <div>
         <div class="flex flex-col">
             <p v-for="message in messages" :key="message.id">
-                {{ message.content }}
+                {{ message.text }}
             </p>
         </div>
         <div class="flex flex-row">
diff --git a/nginx/vue/src/stores/messages.js b/nginx/vue/src/stores/messages.js
index 51b5730..470ca4a 100644
--- a/nginx/vue/src/stores/messages.js
+++ b/nginx/vue/src/stores/messages.js
@@ -1,16 +1,14 @@
 import { defineStore } from "pinia";
 import { ref, computed } from "vue";
 
-const URL = "/api/ws";
-
-const message_template = {
-  id: 0,
-  content: "Yo",
-};
+function getWebSocketURL() {
+  const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
+  return `${protocol}//${window.location.host}/api/ws`;
+}
 
 export const useMessagesStore = defineStore("messages", () => {
   const socket = ref(null);
-  const messages = ref([message_template]);
+  const messages = ref([]);
   const isConnected = ref(false);
   const lastError = ref(null);
 
@@ -19,7 +17,7 @@ export const useMessagesStore = defineStore("messages", () => {
   function connect() {
     if (socket.value && isConnected.value) return;
 
-    socket.value = new WebSocket(URL);
+    socket.value = new WebSocket(getWebSocketURL());
 
     socket.value.onopen = () => {
       isConnected.value = true;
@@ -31,8 +29,7 @@ export const useMessagesStore = defineStore("messages", () => {
         const data = JSON.parse(event.data);
         messages.value.push(data);
       } catch {
-        // fallback if server sends plain text
-        messages.value.push(event.data);
+        messages.value.push({ text: event.data });
       }
     };
 
@@ -53,9 +50,9 @@ export const useMessagesStore = defineStore("messages", () => {
     isConnected.value = false;
   }
 
-  function sendMessage(payload) {
+  function sendMessage(text) {
     if (!socket.value || !isConnected.value) return;
-    socket.value.send(JSON.stringify(payload));
+    socket.value.send(JSON.stringify({ text }));
   }
 
   function clearMessages() {
diff --git a/nginx/vue/src/views/home/Home.vue b/nginx/vue/src/views/home/Home.vue
index 623de79..ebadc4c 100644
--- a/nginx/vue/src/views/home/Home.vue
+++ b/nginx/vue/src/views/home/Home.vue
@@ -28,6 +28,7 @@ import Consumption from "./Consumption.vue";
                 class="sidebar border-children background-children place-content-between flex-1 flex flex-col m-10 w-60"
             >
                 <Miku />
+                <Chat />
             </div>
             <div
                 class="a4page-portrait homeGrid relative background-children border-children bdr-1"
@@ -56,7 +57,6 @@ import Consumption from "./Consumption.vue";
                     <CommitHistory class="text-center" />
 
                     <!-- <Elle class="flex-1" /> -->
-                    <!-- <Chat class="bdr-2 bg-bg_primary" /> -->
                     <!-- <MusicPlayer /> -->
                 </div>
                 <div>