diff --git a/package.json b/package.json
index fb0c969..915300b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lms",
-  "version": "1.1.30",
+  "version": "1.1.31",
   "description": "Autonomy Studio LMS Electron app",
   "main": "./out/main/index.js",
   "author": {
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 344ad02..df9e81b 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -522,7 +522,7 @@ function LocalPcWorkspaceMockup({
   const visualizationHostInstanceId = useRef(`${platformId}:${Math.random().toString(36).slice(2)}`).current
   const [powerActionModalOpen, setPowerActionModalOpen] = useState(false)
   const [cameraOpen, setCameraOpen] = useState(false)
-  useEffect(() => { setCameraOpen(false) }, [platformId, workspaceVisible])
+  useEffect(() => { setCameraOpen(false) }, [platformId, workspaceVisible, courseKey, weekNumber])
   const [controlCountdownNow, setControlCountdownNow] = useState(Date.now())
   const {
     qaMode,
@@ -3424,7 +3424,8 @@ function LocalPcWorkspaceMockup({
   return (
     <div ref={workspaceRootRef} className={['relative h-full min-h-0 overflow-hidden', surface].join(' ')}>
       {cameraOpen && workspaceVisible && <WorkspaceCameraPanel
-        camera={platformOptions.find((platform) => platform.id === platformId)?.camera}
+        key={`${courseKey}:${weekNumber}`}
+        camera={curriculumWeek.detail.camera}
         dark={dark}
         onClose={() => setCameraOpen(false)}
       />}
diff --git a/src/renderer/src/features/curriculum/types.ts b/src/renderer/src/features/curriculum/types.ts
index d876eb6..495a15b 100644
--- a/src/renderer/src/features/curriculum/types.ts
+++ b/src/renderer/src/features/curriculum/types.ts
@@ -41,6 +41,7 @@ export type CurriculumWeek = {
   duration: string
   github: string
   detail: {
+    camera?: { url: string; password: string } | null
     overview: string
     learningSteps?: LearningStep[]
     topicDetails: string[]
diff --git a/src/renderer/src/features/platforms/types.ts b/src/renderer/src/features/platforms/types.ts
index 672e48c..ee81d79 100644
--- a/src/renderer/src/features/platforms/types.ts
+++ b/src/renderer/src/features/platforms/types.ts
@@ -34,7 +34,6 @@ export type VehicleRuntimeProfile = {
 }
 
 export type PlatformOption = {
-  camera?: { url: string; password: string } | null
   id: string
   platformKey: string
   title: string