diff --git a/api-gateway/api.conf b/api-gateway/api.conf
index 248882c50b..319951781e 100644
--- a/api-gateway/api.conf
+++ b/api-gateway/api.conf
@@ -50,6 +50,14 @@ server {
     proxy_set_header X-Forwarded-Proto $scheme;
   }
 
+  location /chat {
+    proxy_pass http://chat_service/chat;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+  }
+
   location /collaboration {
     proxy_pass http://collab_service/;
 
diff --git a/api-gateway/nginx.conf b/api-gateway/nginx.conf
index f4b8e91233..b8e0477170 100644
--- a/api-gateway/nginx.conf
+++ b/api-gateway/nginx.conf
@@ -35,6 +35,10 @@ http {
   upstream ai_service {
     server ai-service:3005;
   }
+
+  upstream chat_service {
+    server chat-service:3006;
+  }
   
   include /etc/nginx/conf.d/api.conf;
 }
\ No newline at end of file