diff --git a/server/abstractport.cpp b/server/abstractport.cpp
index 0a97ff9..5d36895 100644
--- a/server/abstractport.cpp
+++ b/server/abstractport.cpp
@@ -377,11 +377,16 @@ void AbstractPort::updatePacketListInterleaved()
 
     qDebug("In %s", __FUNCTION__);
 
+    clearPacketList();
+    if (streamList_.size() == 0)
+    {
+        isSendQueueDirty_ = false;
+        return;
+    }
+
     // First sort the streams by ordinalValue
     qSort(streamList_.begin(), streamList_.end(), StreamBase::StreamLessThan);
 
-    clearPacketList();
-
     for (int i = 0; i < streamList_.size(); i++)
     {
         if (!streamList_[i]->isEnabled())