diff --git a/assignment-client/src/messages/MessagesMixer.cpp b/assignment-client/src/messages/MessagesMixer.cpp
index c54229b7f2..1ab698b456 100644
--- a/assignment-client/src/messages/MessagesMixer.cpp
+++ b/assignment-client/src/messages/MessagesMixer.cpp
@@ -73,8 +73,6 @@ void MessagesMixer::handleMessagesSubscribe(QSharedPointer<ReceivedMessage> mess
     QString channel = QString::fromUtf8(message->getMessage());
 
     _channelSubscribers[channel] << senderUUID;
-
-    _allSubscribers[senderUUID] = 0;
 }
 
 void MessagesMixer::handleMessagesUnsubscribe(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
@@ -84,18 +82,6 @@ void MessagesMixer::handleMessagesUnsubscribe(QSharedPointer<ReceivedMessage> me
     if (_channelSubscribers.contains(channel)) {
         _channelSubscribers[channel].remove(senderUUID);
     }
-
-    bool isSenderSubscribed = false;
-    QList<QSet<QUuid>> allChannels = _channelSubscribers.values();
-    foreach (const QSet<QUuid> channel, allChannels) { 
-        if (channel.contains(senderUUID)) {
-            isSenderSubscribed = true;
-        }
-    }
-
-    if (!isSenderSubscribed && _allSubscribers.contains(senderUUID)) {
-        _allSubscribers.remove(senderUUID);
-    }
 }
 
 void MessagesMixer::sendStatsPacket() {