diff --git a/packages/frontend/src/pages/room.vue b/packages/frontend/src/pages/room.vue
index fda0f44d75..85b3cb2af4 100644
--- a/packages/frontend/src/pages/room.vue
+++ b/packages/frontend/src/pages/room.vue
@@ -178,7 +178,13 @@ function onKeydown(ev: KeyboardEvent) {
 	} else if (ev.code === 'Tab') {
 		ev.preventDefault();
 		ev.stopPropagation();
-		toggleEditMode();
+		if (isEditMode.value) {
+			engine.value.exitEditMode();
+			isEditMode.value = false;
+		} else {
+			engine.value.enterEditMode();
+			isEditMode.value = true;
+		}
 	} else if (ev.code === 'KeyZ') {
 		ev.preventDefault();
 		ev.stopPropagation();
diff --git a/packages/frontend/src/utility/room/engine.ts b/packages/frontend/src/utility/room/engine.ts
index da097759a7..e69e572a08 100644
--- a/packages/frontend/src/utility/room/engine.ts
+++ b/packages/frontend/src/utility/room/engine.ts
@@ -748,9 +748,7 @@ export class RoomEngine {
 	public async init() {
 		await this.loadRoomModel();
 		await this.loadEnvModel();
-		// beamLampがあるとなぜかclustered lightがエラーになる
-		// https://forum.babylonjs.com/t/anisotropy-with-clusteredlightcontainer-bug/63040
-		await Promise.all(this.roomState.installedObjects.filter(o => o.type !== 'beamLamp').map(o => this.loadObject({
+		await Promise.all(this.roomState.installedObjects.map(o => this.loadObject({
 			id: o.id,
 			type: o.type,
 			position: new BABYLON.Vector3(...o.position),