diff --git a/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.html b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.html
index 7dbfe03..42e78ab 100644
--- a/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.html
+++ b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.html
@@ -17,11 +17,6 @@
 			</div>
 		</div>
 	}
-} @else if (isInRoomForm()) {
-	<!-- Edit and create Room view  -->
-	<div>
-		<router-outlet></router-outlet>
-	</div>
 } @else {
 	<div class="ov-page-container ov-mb-xxl" id="rooms-page-container">
 		<div class="page-header" id="rooms-page-header">
diff --git a/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.ts b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.ts
index e05d21c..3297999 100644
--- a/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.ts
+++ b/frontend/projects/shared-meet-components/src/lib/pages/console/rooms/rooms.component.ts
@@ -72,13 +72,6 @@ export class RoomsComponent implements OnInit {
 		await this.loadRooms();
 	}
 
-	isInRoomForm(): boolean {
-		return (
-			this.navigationService.containsRoute('/rooms/') &&
-			(this.navigationService.containsRoute('/edit') || this.navigationService.containsRoute('/new'))
-		);
-	}
-
 	async onRoomAction(action: RoomTableAction) {
 		switch (action.action) {
 			case 'create':
diff --git a/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts b/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts
index 51d11ec..6e6217b 100644
--- a/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts
+++ b/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts
@@ -76,11 +76,15 @@ export const baseRoutes: Routes = [
 			},
 			{
 				path: 'rooms',
-				component: RoomsComponent,
-				children: [
-					{ path: 'new', component: RoomWizardComponent },
-					{ path: ':roomId/edit', component: RoomWizardComponent }
-				]
+				component: RoomsComponent
+			},
+			{
+				path: 'rooms/new',
+				component: RoomWizardComponent
+			},
+			{
+				path: 'rooms/:roomId/edit',
+				component: RoomWizardComponent
 			},
 			{
 				path: 'recordings',