diff --git a/inc/Classes.php b/inc/Classes.php
index eb00a83..1d5a4ac 100644
--- a/inc/Classes.php
+++ b/inc/Classes.php
@@ -40,7 +40,8 @@
           s.id IS NULL,
           is_current DESC,
           '.($isSignedIn ? 'u_s.subject_id IS NULL,
-          ' : '').'s.friendly_name ASC';
+          ' : '').'s.friendly_name ASC,
+          c.room ASC';
     $query = $con->prepare($sentence);
 
     if ($unix_time === null) $unix_time = time();