diff --git a/ssh1login.c b/ssh1login.c
index 08282d5b..8b6f1d7b 100644
--- a/ssh1login.c
+++ b/ssh1login.c
@@ -132,6 +132,7 @@ int ssh1_common_filter_queue(PacketProtocolLayer *ppl)
             ssh_remote_error(ppl->ssh,
                              "Server sent disconnect message:\n\"%.*s\"",
                              PTRLEN_PRINTF(msg));
+            pq_pop(ppl->in_pq);
             return TRUE;               /* indicate that we've been freed */
 
           case SSH1_MSG_DEBUG:
diff --git a/ssh2transport.c b/ssh2transport.c
index 343d6787..7f316ec0 100644
--- a/ssh2transport.c
+++ b/ssh2transport.c
@@ -530,6 +530,7 @@ int ssh2_common_filter_queue(PacketProtocolLayer *ppl)
                 ((reason > 0 && reason < lenof(ssh2_disconnect_reasons)) ?
                  ssh2_disconnect_reasons[reason] : "unknown"),
                 PTRLEN_PRINTF(msg));
+            pq_pop(ppl->in_pq);
             return TRUE;               /* indicate that we've been freed */
 
           case SSH2_MSG_DEBUG: