diff --git a/src/plainui/views/assemblies.py b/src/plainui/views/assemblies.py
index 67037006d0666742ceb68e1b7900b5db0fb9b8cc..c6a27a38df96cf4c3590b1087aa8a51cbbe94f7e 100644
--- a/src/plainui/views/assemblies.py
+++ b/src/plainui/views/assemblies.py
@@ -67,7 +67,7 @@ class AssemblyView(ConferenceRequiredMixin, DetailView):
             Prefetch(
                 'rooms',
                 to_attr='public_rooms',
-                queryset=Room.objects.conference_accessible(self.conf).order_by('name'),
+                queryset=Room.objects.conference_accessible(self.conf).order_by('official_room_order', 'name'),
             ),
             Prefetch(
                 'tags',