diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c
index ab613b3c7..3643d0ffe 100644
--- a/libfreerdp/core/connection.c
+++ b/libfreerdp/core/connection.c
@@ -394,6 +394,7 @@ BOOL rdp_client_disconnect(rdpRdp* rdp)
 		return FALSE;
 
 	codecs_free(context->codecs);
+	context->codecs = NULL;
 	return TRUE;
 }