diff --git a/bc.lua b/bc.lua
index 306cb119cd00..eea38bed2999 100644
--- a/bc.lua
+++ b/bc.lua
@@ -148,11 +148,14 @@ function BaseControl:finalize(waits, timeout)
   end
 
   -- Announce own nouns and verbs
-  self.network:broadcast{
-    ty=Message.Register,
-    nouns=self:nouns(true),
-    verbs=self:verbs(true),
-  }
+  local nouns, verbs = self:nouns(true), self:verbs(true)
+  if #nouns > 0 or #verbs > 0 then
+    self.network:broadcast{
+      ty=Message.Register,
+      nouns=nouns,
+      verbs=verbs,
+    }
+  end
 
   if #(waits or {}) ~= 0 then
     -- Wait for requested names