diff --git a/roomunlock.html b/roomunlock.html
index 89f2b16968b5599ee258f58a05c29f0cdc2293c2..61dbef38cc2505b9da9939733538bb6acc823ed2 100644
--- a/roomunlock.html
+++ b/roomunlock.html
@@ -99,9 +99,16 @@
         const roomUrl = document.getElementById('roomUrl');
 
         let room = window.location.href.substring(window.location.href.lastIndexOf('/') + 1)
-        if (room.length >= 2 && room !== "raumfreischaltung") {
-            roomField.value = room
-            get_room(room)
+        if (room !== "raumfreischaltung" && room !== "") {
+            roomField.value = room;
+
+            if (room.length >= 2) {
+                get_room(room);
+            } else {
+                errorText.innerText = "Raumname zu kurz.";
+                hiddenFieldError.classList.add("visible");
+                hiddenFieldError.ariaHidden = "false";
+            }
         }
 
         function get_room(_room) {