diff --git a/scene/3d/room.cpp b/scene/3d/room.cpp
index 82c5b97cd6d..41272302ccb 100644
--- a/scene/3d/room.cpp
+++ b/scene/3d/room.cpp
@@ -225,6 +225,13 @@ String Room::get_configuration_warning() const {
 		}
 	}
 
+	if (_planes.size() > 80) {
+		if (!warning.empty()) {
+			warning += "\n\n";
+		}
+		warning += TTR("Room convex hull contains a large number of planes.\nConsider simplifying the room bound in order to increase performance.");
+	}
+
 	return warning;
 }
 
diff --git a/scene/3d/room_manager.cpp b/scene/3d/room_manager.cpp
index e1a67448113..178ffcf89df 100644
--- a/scene/3d/room_manager.cpp
+++ b/scene/3d/room_manager.cpp
@@ -796,6 +796,7 @@ void RoomManager::_third_pass_rooms(const LocalVector<Portal *> &p_portals) {
 			found_errors = true;
 		}
 		room->update_gizmo();
+		room->update_configuration_warning();
 	}
 
 	if (found_errors) {