diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 55765d1cfb..5bb3939bff 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -774,6 +774,12 @@ start:
 			}
 		}
 
+	if (s->d1->listen && rr->type != SSL3_RT_HANDSHAKE)
+		{
+		rr->length = 0;
+		goto start;
+		}
+
 	/* we now have a packet which can be read and processed */
 
 	if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,