diff --git a/libretroshare/src/services/p3channels.cc b/libretroshare/src/services/p3channels.cc
index 331816e88..34348d2b1 100644
--- a/libretroshare/src/services/p3channels.cc
+++ b/libretroshare/src/services/p3channels.cc
@@ -707,12 +707,13 @@ bool p3Channels::channelGetAutoDl(const std::string& chId, bool& autoDl)
 	statMap::iterator it = mChannelStatus.find(chId);
 
 	if(it != mChannelStatus.end())
-	{
 		autoDl = it->second & RS_CHAN_STATUS_AUTO_DL;
-		return true;
+	else	// create the entry. No particular risk with that.
+	{
+		mChannelStatus[chId] = 0 ;
+		autoDl = false ;
 	}
-
-	return false;
+	return true;
 }
 
 /***************************************************************************************/
diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index 73852dd38..39dabef4e 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -520,8 +520,7 @@ void ChannelFeed::updateChannelMsgs()
         postButton->setEnabled(false);
     }
 
-    if (!(ci.channelFlags & RS_DISTRIB_ADMIN) &&
-         (ci.channelFlags & RS_DISTRIB_SUBSCRIBED)) {
+    if (ci.channelFlags & RS_DISTRIB_SUBSCRIBED) {
         actionEnable_Auto_Download->setEnabled(true);
     } else {
         actionEnable_Auto_Download->setEnabled(false);