diff --git a/rocketchatserver.cpp b/rocketchatserver.cpp
index 950bf168a7ee0e713d192937bb76d3c9071a822b..f1d50638df6ea734b9ce1c31c5c31cfb8bbedb38 100755
--- a/rocketchatserver.cpp
+++ b/rocketchatserver.cpp
@@ -981,7 +981,11 @@ void RocketChatServerData::handleChannelMessage( const QJsonObject &pMessage )
                 } else {
                     if ( mChannels->contains( rid ) && !mChannels->get( rid ).isNull() ) {
                         auto channel =  mChannels->get( rid );
-                        channel->setName( name );
+
+                        if ( name != "" ) {
+                            channel->setName( name );
+                        }
+
                         channel->setBlocked( blocked );
                         channel->setUnreadMessages( unread );
                         channel->setUsername( username );