diff --git a/src/card-controller/folders/manager.ts b/src/card-controller/folders/manager.ts
index 550fdefc..010216ed 100644
--- a/src/card-controller/folders/manager.ts
+++ b/src/card-controller/folders/manager.ts
@@ -41,6 +41,9 @@ export class FoldersManager {
     }
   }
 
+  public hasFolders(): boolean {
+    return this._folders.size > 0;
+  }
   public getFolderCount(): number {
     return this._folders.size;
   }
diff --git a/src/card-controller/view/factory.ts b/src/card-controller/view/factory.ts
index 962f0eed..7b0ab381 100644
--- a/src/card-controller/view/factory.ts
+++ b/src/card-controller/view/factory.ts
@@ -34,16 +34,17 @@ export class ViewFactory {
       const cameraIDs = [
         ...getCameraIDsForViewName(this._api.getCameraManager(), viewName),
       ];
-      if (!cameraIDs.length) {
-        return null;
-      }
 
-      if (options?.baseView?.camera && config.view.default_cycle_camera) {
+      if (
+        cameraIDs.length &&
+        options?.baseView?.camera &&
+        config.view.default_cycle_camera
+      ) {
         const currentIndex = cameraIDs.indexOf(options.baseView.camera);
         const targetIndex = currentIndex + 1 >= cameraIDs.length ? 0 : currentIndex + 1;
         cameraID = cameraIDs[targetIndex];
       } else {
-        cameraID = cameraIDs[0];
+        cameraID = cameraIDs[0] ?? null;
       }
     }
 
diff --git a/src/view/view-to-cameras.ts b/src/view/view-to-cameras.ts
index 0f88b22f..19d4e6c6 100644
--- a/src/view/view-to-cameras.ts
+++ b/src/view/view-to-cameras.ts
@@ -19,6 +19,7 @@ export const getCameraIDsForViewName = (
     case 'diagnostics':
     case 'image':
     case 'folder':
+    case 'media':
       return cameraManager.getStore().getCameraIDs();
 
     case 'live':
@@ -44,12 +45,5 @@ export const getCameraIDsForViewName = (
       return cameraManager
         .getStore()
         .getCameraIDsWithCapability(capabilityMatchAnyMedia);
-
-    case 'media':
-      return cameraID
-        ? cameraManager
-            .getStore()
-            .getAllDependentCameras(cameraID, capabilityMatchAnyMedia)
-        : cameraManager.getStore().getCameraIDsWithCapability(capabilityMatchAnyMedia);
   }
 };
diff --git a/tests/card-controller/folders/manager.test.ts b/tests/card-controller/folders/manager.test.ts
index bab46949..59feedc9 100644
--- a/tests/card-controller/folders/manager.test.ts
+++ b/tests/card-controller/folders/manager.test.ts
@@ -19,6 +19,7 @@ describe('FoldersManager', () => {
     const api = createCardAPI();
     const manager = new FoldersManager(api);
     expect(manager.getFolderCount()).toBe(0);
+    expect(manager.hasFolders()).toBe(false);
   });
 
   describe('should add folders', () => {
@@ -32,6 +33,7 @@ describe('FoldersManager', () => {
         ...folder,
         title: 'Folder 0',
       });
+      expect(manager.hasFolders()).toBe(true);
     });
 
     it('should add a folder correctly with a title', () => {
@@ -128,7 +130,7 @@ describe('FoldersManager', () => {
       const folder: FolderConfig = createFolder();
       const query: FolderQuery = {
         folder,
-        path: ['media-source://'],
+        path: [{ id: 'media-source://' }],
       };
 
       const executor = mock<FoldersExecutor>();
@@ -144,7 +146,7 @@ describe('FoldersManager', () => {
       const folder: FolderConfig = createFolder();
       const query: FolderQuery = {
         folder,
-        path: ['media-source://'],
+        path: [{ id: 'media-source://' }],
       };
 
       const executor = mock<FoldersExecutor>();
@@ -160,7 +162,7 @@ describe('FoldersManager', () => {
       const folder: FolderConfig = createFolder();
       const query: FolderQuery = {
         folder,
-        path: ['media-source://'],
+        path: [{ id: 'media-source://' }],
       };
 
       const executor = mock<FoldersExecutor>();
@@ -188,7 +190,7 @@ describe('FoldersManager', () => {
       const engineOptions = {};
       const query: FolderQuery = {
         folder,
-        path: ['media-source://'],
+        path: [{ id: 'media-source://' }],
       };
 
       expect(await manager.expandFolder(query, engineOptions)).toEqual([media]);
@@ -203,7 +205,7 @@ describe('FoldersManager', () => {
       const folder = createFolder({ id: 'folder-1' });
 
       expect(
-        await manager.expandFolder({ folder, path: ['media-source://'] }),
+        await manager.expandFolder({ folder, path: [{ id: 'media-source://' }] }),
       ).toBeNull();
 
       expect(executor.expandFolder).not.toBeCalled();
diff --git a/tests/card-controller/view/factory.test.ts b/tests/card-controller/view/factory.test.ts
index 1b120eea..a4b60d6a 100644
--- a/tests/card-controller/view/factory.test.ts
+++ b/tests/card-controller/view/factory.test.ts
@@ -20,7 +20,7 @@ describe('getViewDefault', () => {
     expect(factory.getViewDefault()).toBeNull();
   });
 
-  it('should return null if no cameras support view', () => {
+  it('should throw if no cameras support view', () => {
     const api = createCardAPI();
     vi.mocked(api.getConfigManager().getConfig).mockReturnValue(createConfig());
     vi.mocked(api.getCameraManager).mockReturnValue(createCameraManager());
@@ -44,7 +44,7 @@ describe('getViewDefault', () => {
     );
 
     const factory = new ViewFactory(api);
-    expect(factory.getViewDefault()).toBeNull();
+    expect(() => factory.getViewDefault()).toThrowError(/No cameras support this view/);
   });
 
   it('should create view', () => {
diff --git a/tests/card-controller/view/view-manager.test.ts b/tests/card-controller/view/view-manager.test.ts
index ce8d7012..b7075a11 100644
--- a/tests/card-controller/view/view-manager.test.ts
+++ b/tests/card-controller/view/view-manager.test.ts
@@ -313,7 +313,7 @@ describe('isViewSupportedByCamera', () => {
     ['recording' as const, false],
     ['recordings' as const, false],
     ['timeline' as const, false],
-    ['media' as const, false],
+    ['media' as const, true],
   ])('%s', (viewName: AdvancedCameraCardView, expected: boolean) => {
     const api = createInitializedCardAPI();
     vi.mocked(api.getCameraManager).mockReturnValue(createCameraManager());
diff --git a/tests/view/view-to-cameras.test.ts b/tests/view/view-to-cameras.test.ts
index 390741bb..b66aaa02 100644
--- a/tests/view/view-to-cameras.test.ts
+++ b/tests/view/view-to-cameras.test.ts
@@ -11,7 +11,7 @@ import {
 
 describe('getCameraIDsForViewName', () => {
   describe('views that are always supported', () => {
-    it.each([['image' as const], ['diagnostics' as const]])(
+    it.each([['diagnostics' as const], ['image' as const], ['media' as const]])(
       '%s',
       (viewName: AdvancedCameraCardView) => {
         const cameraManager = createCameraManager();
@@ -47,9 +47,6 @@ describe('getCameraIDsForViewName', () => {
       ['snapshots' as const, 'snapshots' as const],
       ['recording' as const, 'recordings' as const],
       ['recordings' as const, 'recordings' as const],
-      ['media' as const, 'clips' as const],
-      ['media' as const, 'snapshots' as const],
-      ['media' as const, 'recordings' as const],
       ['timeline' as const, 'clips' as const],
       ['timeline' as const, 'snapshots' as const],
       ['timeline' as const, 'recordings' as const],