diff --git a/frontend/src/WebSocket.jsx b/frontend/src/WebSocket.jsx
index 6bd048a4..afb6ce17 100644
--- a/frontend/src/WebSocket.jsx
+++ b/frontend/src/WebSocket.jsx
@@ -29,7 +29,7 @@ export const WebsocketProvider = ({ children }) => {
   useEffect(() => {
     let wsUrl = `${window.location.host}/ws/`;
     if (import.meta.env.DEV) {
-      wsUrl = `${window.location.hostname}:5656/ws/`;
+      wsUrl = `${window.location.hostname}:8001/ws/`;
     }
 
     if (window.location.protocol.match(/https/)) {
diff --git a/frontend/src/pages/Guide.jsx b/frontend/src/pages/Guide.jsx
index 5f22d1d4..3e65bc23 100644
--- a/frontend/src/pages/Guide.jsx
+++ b/frontend/src/pages/Guide.jsx
@@ -463,16 +463,17 @@ export default function TVChannelGuide({ startDate, endDate }) {
               {selectedProgram.description || 'No description available.'}
             </Text>
             {/* Only show the Watch button if currently live */}
-            {now.isAfter(dayjs(selectedProgram.start_time)) &&
-              now.isBefore(dayjs(selectedProgram.end_time)) && (
-                <Flex mih={50} gap="xs" justify="flex-end" align="flex-end">
-                  <Button
-                    variant="transparent"
-                    color="gray"
-                    onClick={() => record(selectedProgram)}
-                  >
-                    Record
-                  </Button>
+            <Flex mih={50} gap="xs" justify="flex-end" align="flex-end">
+              <Button
+                variant="transparent"
+                color="gray"
+                onClick={() => record(selectedProgram)}
+              >
+                Record
+              </Button>
+
+              {now.isAfter(dayjs(selectedProgram.start_time)) &&
+                now.isBefore(dayjs(selectedProgram.end_time)) && (
                   <Button
                     variant="transparent"
                     color="gray"
@@ -480,8 +481,8 @@ export default function TVChannelGuide({ startDate, endDate }) {
                   >
                     Watch Now
                   </Button>
-                </Flex>
-              )}
+                )}
+            </Flex>
           </>
         )}
       </Modal>