diff --git a/AKScheduling/api.py b/AKScheduling/api.py
index 61c939ede1526504409a90ff52bcd55f66c76302..e78fda781df734d93edc001ae7933152a536e92e 100644
--- a/AKScheduling/api.py
+++ b/AKScheduling/api.py
@@ -165,7 +165,7 @@ class EventSerializer(serializers.ModelSerializer):
 
         # Updated room if needed (pk changed -- otherwise, no need for an additional database lookup)
         new_room_id = validated_data.get('room')["pk"]
-        if instance.room.pk != new_room_id:
+        if instance.room is None or instance.room.pk != new_room_id:
             instance.room = get_object_or_404(Room, pk=new_room_id)
 
         instance.save()
diff --git a/AKScheduling/templates/admin/AKScheduling/manage_tracks.html b/AKScheduling/templates/admin/AKScheduling/manage_tracks.html
index 6d6824e857b9bb509b2aeb629835a69fc4789732..491c713d8403d6f204f397444afdde836a7ee13e 100644
--- a/AKScheduling/templates/admin/AKScheduling/manage_tracks.html
+++ b/AKScheduling/templates/admin/AKScheduling/manage_tracks.html
@@ -224,7 +224,7 @@
             <ul data-id="None" data-sync="false" class="ak-list">
                 {% for ak in aks_without_track %}
                     <li data-ak-id="{{ ak.pk }}" data-bs-toggle="tooltip" data-placement="top" title="">
-                        {{ ak.name }} ({{ ak.category }})
+                        {{ ak.name }} <span style="color:{{ ak.category.color }}">({{ ak.category }})</span>
                     </li>
                 {% endfor %}
             </ul>