diff --git a/src/aoclient.cpp b/src/aoclient.cpp
index 984999a..71ffe0a 100644
--- a/src/aoclient.cpp
+++ b/src/aoclient.cpp
@@ -68,10 +68,17 @@ void AOClient::clientDisconnected()
             false;
         server->updateCharsTaken(server->areas[current_area]);
     }
+    bool update_locks;
     for (AreaData* area : server->areas) {
         area->owners.removeAll(id);
         area->invited.removeAll(id);
+        if (area->owners.isEmpty() && area->locked != AreaData::FREE) {
+            area->locked = AreaData::FREE;
+            update_locks = true;
+        }
     }
+    if (update_locks)
+        arup(ARUPType::LOCKED, true);
     arup(ARUPType::CM, true);
 }
 
diff --git a/src/commands.cpp b/src/commands.cpp
index f29f88b..f347a85 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -504,8 +504,13 @@ void AOClient::cmdUnCM(int argc, QStringList argv)
     area->invited.removeAll(id);
     sendServerMessage("You are no longer CM in this area.");
     arup(ARUPType::CM, true);
-    if (area->owners.isEmpty())
+    if (area->owners.isEmpty()) {
         area->invited.clear();
+        if (area->locked != AreaData::FREE) {
+            area->locked = AreaData::FREE;
+            arup(ARUPType::LOCKED, true);
+        }
+    }
 }
 
 void AOClient::cmdInvite(int argc, QStringList argv)