diff --git a/components/discovery/discoverycomponent.cpp b/components/discovery/discoverycomponent.cpp
index bd1f3e1bf..7d42b0221 100644
--- a/components/discovery/discoverycomponent.cpp
+++ b/components/discovery/discoverycomponent.cpp
@@ -484,7 +484,9 @@ void DiscoveryComponent::ProcessDiscoveryMessage(string identity, DiscoveryMessa
 	if (IsBroker())
 		SendDiscoveryMessage("discovery::NewComponent", identity, Endpoint::Ptr());
 
-	if (endpoint)
+	/* don't send a welcome message for discovery::RegisterComponent
+	   messages unless we're a broker */
+	if (endpoint && (trusted || IsBroker()))
 		FinishDiscoverySetup(endpoint);
 }