diff --git a/app/src/Server.js b/app/src/Server.js
index 401883a1..da040c83 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -475,8 +475,10 @@ io.on('connection', (socket) => {
         log.debug('Room action:', data);
         switch (data.action) {
             case 'lock':
-                roomList.get(socket.room_id).setLocked(true, data.password);
-                roomList.get(socket.room_id).broadCast(socket.id, 'roomAction', data.action);
+                if (!roomList.get(socket.room_id).isLocked()) {
+                    roomList.get(socket.room_id).setLocked(true, data.password);
+                    roomList.get(socket.room_id).broadCast(socket.id, 'roomAction', data.action);
+                }
                 break;
             case 'checkPassword':
                 let roomData = {