diff --git a/src/netbeans.c b/src/netbeans.c
index 441ca76..b0e7d9e 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -99,8 +99,11 @@
     {
 	netbeans_send_disconnect();
 	if (nb_channel != NULL)
+	{
 	    /* Close the socket and remove the input handlers. */
 	    channel_close(nb_channel, TRUE);
+	    channel_clear(nb_channel);
+	}
 	nb_channel = NULL;
     }