diff --git a/frontend/src/components/Stream/StreamerRoute.tsx b/frontend/src/components/Stream/StreamerRoute.tsx
index e915609..8835479 100644
--- a/frontend/src/components/Stream/StreamerRoute.tsx
+++ b/frontend/src/components/Stream/StreamerRoute.tsx
@@ -35,7 +35,7 @@ const StreamerRoute: React.FC = () => {
   }
 
   // streamId=0 is a special case for the streamer's latest stream
-  return isLive ? <VideoPage streamId={0} /> : (streamerName ? <UserPage username={streamerName} /> : <div>Error: Streamer not found</div>);
+  return isLive ? <VideoPage streamId={1} /> : (streamerName ? <UserPage username={streamerName} /> : <div>Error: Streamer not found</div>);
 };
 
 export default StreamerRoute;
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index a5d45b5..573f21a 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -65,6 +65,10 @@ http {
 
         location /socket.io/ {
             proxy_pass http://web_server:5000/socket.io/;
+            proxy_http_version 1.1;
+            proxy_buffering off;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
         }
 
         location / {
diff --git a/web_server/blueprints/chat.py b/web_server/blueprints/chat.py
index d113b54..f22f67b 100644
--- a/web_server/blueprints/chat.py
+++ b/web_server/blueprints/chat.py
@@ -5,7 +5,7 @@ from datetime import datetime
 from flask_socketio import SocketIO
 
 chat_bp = Blueprint("chat", __name__)
-socketio = SocketIO(cors_allowed_origins="*")
+socketio = SocketIO()
 
 # <---------------------- ROUTES NEEDS TO BE CHANGED TO VIDEO OR DELETED AS DEEMED APPROPRIATE ---------------------->
 
@@ -13,7 +13,7 @@ socketio = SocketIO(cors_allowed_origins="*")
 def handle_connection() -> None:
     """
     Accept the connection from the frontend.
-    """
+    """ 
     print("Client Connected")  # Confirmation connect has been made
 
 
@@ -64,10 +64,13 @@ def get_past_chat(stream_id: int):
                                     LIMIT 50
                                )
                                ORDER BY time_sent ASC;""", (stream_id,))
+
     db.close_connection()
 
     # Create JSON output of chat_history to pass through NGINX proxy
-    chat_history = [{"chatter_id": chat[0], "message": chat[1], "time_sent": chat[2]} for chat in all_chats]
+    print(f"Bollocks: {all_chats}", flush=True)
+    chat_history = [{"chatter_id": chat["chatter_id"], "message": chat["message"], "time_sent": chat["time_sent"]} for chat in all_chats]
+    print(f"chat history: {chat_history}", flush=True)
 
     # Pass the chat history to the proxy
     return jsonify({"chat_history": chat_history}), 200
diff --git a/web_server/database/app.db b/web_server/database/app.db
index 03a85db..c7a7cf1 100644
Binary files a/web_server/database/app.db and b/web_server/database/app.db differ
diff --git a/web_server/database/testing_data.sql b/web_server/database/testing_data.sql
index 114f588..5873c31 100644
--- a/web_server/database/testing_data.sql
+++ b/web_server/database/testing_data.sql
@@ -49,6 +49,11 @@ INSERT INTO subscribes (user_id, subscribed_id, since, expires) VALUES
 INSERT INTO users (username, password, email, num_followers, stream_key, is_partnered, bio) VALUES 
 ('GamerDude2', 'password123', 'gamerdude3@gmail.com', 3200, '7890', 0, 'Streaming my gaming adventures!');
 
+INSERT INTO chat (stream_id, chatter_id, message) VALUES
+(1, 'Susan', 'Hey Every, loving the stream'),
+(1, 'Susan', 'This stream is crazy man'),
+(1, 'JohnnyHash', 'Woah, cannot believe that');
+
 SELECT * FROM users;
 SELECT * FROM follows;
 SELECT * FROM user_preferences;
@@ -63,4 +68,16 @@ SELECT * FROM stream_tags;
 SELECT name FROM sqlite_master WHERE type='table';
 
 
-SELECT isLive FROM streams WHERE user_id = '5';
\ No newline at end of file
+SELECT isLive FROM streams WHERE user_id = '5';
+
+
+
+SELECT *
+FROM (
+    SELECT chatter_id, message, time_sent
+    FROM chat
+    WHERE stream_id = 1
+    ORDER BY time_sent DESC
+    LIMIT 50
+)
+ORDER BY time_sent ASC
\ No newline at end of file