diff --git a/app/Http/Controllers/Admin/RoomController.php b/app/Http/Controllers/Admin/RoomController.php
index f77f48d..7d9d861 100644
--- a/app/Http/Controllers/Admin/RoomController.php
+++ b/app/Http/Controllers/Admin/RoomController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
+use App\Models\Audition;
 use App\Models\BonusScoreDefinition;
 use App\Models\Room;
 use App\Models\User;
@@ -27,6 +28,12 @@ class RoomController extends Controller
             ]);
             $unassignedRoom->id = 0;
             $unassignedRoom->save();
+
+            $auditionsToUpdate = Audition::where('room_id', null)->get();
+            foreach ($auditionsToUpdate as $audition) {
+                $audition->room_id = 0;
+                $audition->save();
+            }
             $rooms = Room::with('auditions.entries', 'entries')->orderBy('name')->get();
         }
 
@@ -40,7 +47,8 @@ class RoomController extends Controller
         $rooms = Room::with(['judges.school', 'auditions'])->get();
         $bonusScoresExist = BonusScoreDefinition::count() > 0;
 
-        return view('admin.rooms.judge_assignments', compact('usersWithoutRooms', 'usersWithRooms', 'rooms', 'bonusScoresExist'));
+        return view('admin.rooms.judge_assignments',
+            compact('usersWithoutRooms', 'usersWithRooms', 'rooms', 'bonusScoresExist'));
     }
 
     public function updateJudgeAssignment(Request $request, Room $room)
@@ -119,7 +127,8 @@ class RoomController extends Controller
         }
 
         if ($room->auditions()->count() > 0) {
-            return redirect()->route('admin.rooms.index')->with('error', 'Cannot delete room with auditions. First move the auditions to unassigned or another room');
+            return redirect()->route('admin.rooms.index')->with('error',
+                'Cannot delete room with auditions. First move the auditions to unassigned or another room');
         }
 
         $room->delete();