diff --git a/src/rcw.c b/src/rcw.c
index 0c3e591b045d2d06aa1aee1559041aa80edc2542..b750a16cb5d1387b61b1f14be325487f62e45b8a 100644
--- a/src/rcw.c
+++ b/src/rcw.c
@@ -3399,6 +3399,7 @@ void rco_closewin(RemminaProtocolWidget *gp)
 	if (cnnobj) {
 		cnnobj->remmina_file = NULL;
 		g_free(cnnobj);
+		gp->cnnobj = NULL;
 	}
 
 	remmina_application_condexit(REMMINA_CONDEXIT_ONDISCONNECT);
diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c
index 7a7fbc44b2a28f5fe18f7409de2772234e17104a..307342009f493787d44f9b5cc34060ac7de4cb1d 100644
--- a/src/remmina_protocol_widget.c
+++ b/src/remmina_protocol_widget.c
@@ -1519,6 +1519,9 @@ static gboolean remmina_protocol_widget_dialog_mt_setup(gpointer user_data)
 	RemminaMessagePanel *mp;
 	const gchar *s;
 
+	if (d->gp->cnnobj == NULL)
+		return;
+
 	mp = remmina_message_panel_new();
 
 	if (d->dtype == RPWDT_AUTH) {
diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c
index 307342009f493787d44f9b5cc34060ac7de4cb1d..9a7099c9c631bc3785540ef0fb685e40d7f68da9 100644
--- a/src/remmina_protocol_widget.c
+++ b/src/remmina_protocol_widget.c
@@ -1520,7 +1520,7 @@ static gboolean remmina_protocol_widget_dialog_mt_setup(gpointer user_data)
 	const gchar *s;
 
 	if (d->gp->cnnobj == NULL)
-		return;
+		return FALSE;
 
 	mp = remmina_message_panel_new();