diff --git a/client/src/Pages/UploadPage.tsx b/client/src/Pages/UploadPage.tsx
index 0de6821..d2d509c 100644
--- a/client/src/Pages/UploadPage.tsx
+++ b/client/src/Pages/UploadPage.tsx
@@ -52,6 +52,8 @@ function UploadPage() {
       recorder.onstop = () => {
         const blob = new Blob(chunks, { type: "audio/wav" });
         const file = new File([blob], "recording.wav", { type: "audio/wav" });
+        const tracks = stream.getTracks();
+        tracks.forEach(track => track.stop());
         validateAndSetFile(file);
         handleUpload(file);
       };
@@ -337,6 +339,7 @@ function UploadPage() {
             e.stopPropagation(); // Prevent click from reaching file input
             isRecording ? stopRecording() : startRecording();
           }}
+          disabled={!isConnected}
         >
           {isRecording ? "Stop Recording" : "Start Recording"}
         </Button>