diff --git a/node/PacketDecoder.cpp b/node/PacketDecoder.cpp
index 8bdddbe9b..a2b827c03 100644
--- a/node/PacketDecoder.cpp
+++ b/node/PacketDecoder.cpp
@@ -576,7 +576,7 @@ bool PacketDecoder::_doMULTICAST_FRAME(const RuntimeEnvironment *_r,const Shared
 
 		// First element in newFifo[] is next hop
 		Address nextHop(newFifo,ZT_ADDRESS_LENGTH);
-		if (!nextHop) {
+		if ((!nextHop)&&(!_r->topology->amSupernode())) {
 			SharedPtr<Peer> supernode(_r->topology->getBestSupernode(&origin,1,true));
 			if (supernode)
 				nextHop = supernode->address();
@@ -589,6 +589,8 @@ bool PacketDecoder::_doMULTICAST_FRAME(const RuntimeEnvironment *_r,const Shared
 		// The rest of newFifo[] goes back into the packet
 		memcpy(fifo,newFifo + ZT_ADDRESS_LENGTH,ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_FIFO);
 
+		//TRACE("forwarding MULTICAST_FRAME from %s(%s) to %s, original sender %s, current depth: %u",source().toString().c_str(),_remoteAddress.toString().c_str(),nextHop.toString().c_str(),origin.toString().c_str(),depth);
+
 		// Send to next hop, reusing this packet as scratch space
 		newInitializationVector();
 		setDestination(nextHop);