diff --git a/education-ai-suite/smart-classroom/ui/src/components/Header/Header.tsx b/education-ai-suite/smart-classroom/ui/src/components/Header/Header.tsx
index d097302a0..fbbf78866 100644
--- a/education-ai-suite/smart-classroom/ui/src/components/Header/Header.tsx
+++ b/education-ai-suite/smart-classroom/ui/src/components/Header/Header.tsx
@@ -307,6 +307,7 @@ const HeaderBar: React.FC<HeaderBarProps> = ({ projectName }) => {
   const isRecordingDisabled = isRecording ? false : (
     audioDevicesLoading ||
     hasNothingToRecord ||  // ✅ NEW: Disable if nothing to record
+    videoAnalyticsActive ||
     isBusy ||
     transcriptStatus === 'streaming' ||     
     summaryLoading ||                         
@@ -321,6 +322,7 @@ const HeaderBar: React.FC<HeaderBarProps> = ({ projectName }) => {
 
   const isUploadDisabled =
     isRecording ||
+    videoAnalyticsActive ||
     transcriptStatus === 'streaming' ||      
     isBusy ||                                
     summaryLoading ||                         
diff --git a/education-ai-suite/smart-classroom/ui/src/redux/slices/uiSlice.ts b/education-ai-suite/smart-classroom/ui/src/redux/slices/uiSlice.ts
index 93e66c88e..c7b261687 100644
--- a/education-ai-suite/smart-classroom/ui/src/redux/slices/uiSlice.ts
+++ b/education-ai-suite/smart-classroom/ui/src/redux/slices/uiSlice.ts
@@ -182,13 +182,6 @@ const uiSlice = createSlice({
       state.mindmapLoading = false;
       state.shouldStartMindmap = false;
       state.audioStatus = 'complete';
-      state.hasUploadedVideoFiles = false;
-      const hasVideoConfig = Boolean(
-          state.frontCamera?.trim() || 
-          state.backCamera?.trim() || 
-          state.boardCamera?.trim()
-        );
-      state.videoStatus = hasVideoConfig ? 'ready' : 'no-config';
     },
  
     mindmapFailed(state) {
@@ -370,16 +363,6 @@ const uiSlice = createSlice({
       const hasVideoConfig = Boolean(preservedCameras.frontCamera?.trim() || preservedCameras.backCamera?.trim() || preservedCameras.boardCamera?.trim() || preservedHasUploadedVideoFiles);
       state.videoStatus = hasVideoConfig ? 'ready' : 'no-config';
     },
-
-    clearUploadedFiles(state) {
-    state.hasUploadedVideoFiles = false;
-    const hasVideoConfig = Boolean(
-      state.frontCamera?.trim() || 
-      state.backCamera?.trim() || 
-      state.boardCamera?.trim()
-    );
-    state.videoStatus = hasVideoConfig ? 'ready' : 'no-config';
-  }
   },
 });