diff --git a/neutrinordp/xrdp-neutrinordp.c b/neutrinordp/xrdp-neutrinordp.c
index 72b637ac..869e00b6 100644
--- a/neutrinordp/xrdp-neutrinordp.c
+++ b/neutrinordp/xrdp-neutrinordp.c
@@ -535,6 +535,13 @@ lxrdp_set_param(struct mod *mod, const char *name, const char *value)
     {
         /* Valid (but unused) parameters not logged */
     }
+    else if (g_strcmp(name, "channel.rdpdr") == 0 ||
+             g_strcmp(name, "channel.rdpsnd") == 0 ||
+             g_strcmp(name, "channel.cliprdr") == 0 ||
+             g_strcmp(name, "channel.drdynvc") == 0)
+    {
+        /* Valid (but unused) parameters not logged */
+    }
     else
     {
         LOG(LOG_LEVEL_WARNING, "lxrdp_set_param: unknown name [%s] value [%s]", name, value);
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index 21497c50..b5b8cbb1 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -1798,7 +1798,6 @@ xrdp_mm_process_login_response(struct xrdp_mm *self, struct stream *s)
                 {
                     g_snprintf(port, 255, "%d", 7200 + display);
                 }
-                xrdp_mm_update_allowed_channels(self);
                 xrdp_mm_connect_chansrv(self, ip, port);
             }
         }
@@ -2493,6 +2492,8 @@ xrdp_mm_connect(struct xrdp_mm *self)
         }
     }
 
+    xrdp_mm_update_allowed_channels(self);
+
 #ifdef USE_PAM
     if (use_pam_auth)
     {