diff --git a/aleksis/apps/chronos/admin.py b/aleksis/apps/chronos/admin.py
index 5145472fdbf9eff3349c81d0cbf10a59c24442f2..a29e816f464aa23e62b26294852050a8ab1ae032 100644
--- a/aleksis/apps/chronos/admin.py
+++ b/aleksis/apps/chronos/admin.py
@@ -24,6 +24,8 @@ from .models import (
 )
 from .util.format import format_date_period, format_m2m
 
+from guardian.admin import GuardedModelAdmin
+
 
 def colour_badge(fg: str, bg: str, val: str):
     html = """
@@ -144,7 +146,7 @@ class LessonAdmin(admin.ModelAdmin):
 admin.site.register(Lesson, LessonAdmin)
 
 
-class RoomAdmin(admin.ModelAdmin):
+class RoomAdmin(GuardedModelAdmin):
     list_display = ("short_name", "name")
     list_display_links = ("short_name", "name")
 
diff --git a/aleksis/apps/chronos/migrations/0005_add_permissions.py b/aleksis/apps/chronos/migrations/0005_add_permissions.py
index 11d0dffadb2c5f8ef64d9d9d09a9fa8254d777bb..9fcc2fba01d69514c27568e632e6ee1dba227672 100644
--- a/aleksis/apps/chronos/migrations/0005_add_permissions.py
+++ b/aleksis/apps/chronos/migrations/0005_add_permissions.py
@@ -10,6 +10,12 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AlterModelOptions(
+            name='room',
+            options={'ordering': ['name', 'short_name'],
+                     'permissions': (('view_room_timetable', 'Can view room timetable'),),
+                     'verbose_name': 'Room', 'verbose_name_plural': 'Rooms'},
+        ),
         migrations.AlterModelOptions(
             name='chronosglobalpermissions',
             options={'managed': False, 'permissions': (('view_all_room_timetables', 'Can view all room timetables'), ('view_all_group_timetables', 'Can view all group timetables'), ('view_all_person_timetables', 'Can view all person timetables'), ('view_timetable_overview', 'Can view timetable overview'), ('view_lessons_day', 'Can view all lessons per day'))},
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index e586cc177d60f6cb9a3ae37781c0f3a4601ec48b..9e755bebe14cac939d8379abb91ee4bdad0601db 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -317,7 +317,7 @@ class Room(ExtensibleModel):
         return reverse("timetable", args=["room", self.id])
 
     class Meta:
-        permissions = (("view_room_timetables", _("Can view room timetable")),)
+        permissions = (("view_room_timetable", _("Can view room timetable")),)
         ordering = ["name", "short_name"]
         verbose_name = _("Room")
         verbose_name_plural = _("Rooms")