diff --git a/lib/metadata.js b/lib/metadata.js
index 46d261e3d..2cc11e072 100644
--- a/lib/metadata.js
+++ b/lib/metadata.js
@@ -224,8 +224,9 @@ commands.RM_OWNERS = function (meta, args) {
         changed = true;
     });
 
-    // XXX RESTRICT only owned channels can be restricted
-    // drop the restricted flag if there are no owners
+    if (meta.owners.length === 0 && meta.restricted) {
+        meta.restricted = false;
+    }
 
     return changed;
 };
@@ -305,8 +306,9 @@ commands.RESET_OWNERS = function (meta, args) {
         });
     }
 
-    // XXX RESTRICT only owned channels can be restricted
-    // drop the restricted flag if there are no owners
+    if (meta.owners.length === 0 && meta.restricted) {
+        meta.restricted = false;
+    }
 
     return true;
 };