diff --git a/node/Network.cpp b/node/Network.cpp
index 84b8d3206..adc8e1b8c 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -264,7 +264,7 @@ void Network::requestConfiguration()
 			outp.append((uint64_t)_config->revision());
 		else outp.append((uint64_t)0);
 	}
-	RR->sw->send(outp,true,_id);
+	RR->sw->send(outp,true,0);
 }
 
 bool Network::validateAndAddMembershipCertificate(const CertificateOfMembership &cert)
diff --git a/node/Switch.hpp b/node/Switch.hpp
index 95ca362cc..1b29d0501 100644
--- a/node/Switch.hpp
+++ b/node/Switch.hpp
@@ -110,7 +110,8 @@ public:
 	 * won't be encrypted right. (This is not used for relaying.)
 	 *
 	 * The network ID should only be specified for frames and other actual
-	 * network traffic.
+	 * network traffic. Other traffic such as controller requests and regular
+	 * protocol messages should specify zero.
 	 * 
 	 * @param packet Packet to send
 	 * @param encrypt Encrypt packet payload? (always true except for HELLO)