diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 81bae49594..49eeff8c77 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -391,7 +391,7 @@ void AudioMixer::start() {
     // prepare the NodeList
     nodeList->addSetOfNodeTypesToNodeInterestSet({
         NodeType::Agent, NodeType::EntityScriptServer,
-        NodeType::UpstreamAudioMixer, NodeType::UpstreamAvatarMixer
+        NodeType::UpstreamAudioMixer, NodeType::DownstreamAudioMixer
     });
     nodeList->linkedDataCreateCallback = [&](Node* node) { getOrCreateClientData(node); };
 
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 2212001fec..337845577f 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -264,8 +264,7 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
             NodeType_t sendingNodeType { NodeType::Unassigned };
 
             eachNodeBreakable([&packet, &sendingNodeType](const SharedNodePointer& node){
-                if (node->getType() == NodeType::upstreamType(node->getType())
-                    && node->getPublicSocket() == packet.getSenderSockAddr()) {
+                if (NodeType::isUpstream(node->getType()) && node->getPublicSocket() == packet.getSenderSockAddr()) {
                     sendingNodeType = node->getType();
                     return false;
                 } else {