diff --git a/libfreerdp/core/gateway/arm.c b/libfreerdp/core/gateway/arm.c
index 9a74bd600..c19192798 100644
--- a/libfreerdp/core/gateway/arm.c
+++ b/libfreerdp/core/gateway/arm.c
@@ -378,6 +378,7 @@ BOOL arm_resolve_endpoint(rdpContext* context, DWORD timeout)
 
 	rc = TRUE;
 arm_error:
+	http_response_free(response);
 	arm_free(arm);
 	free(message);
 	return rc;
diff --git a/libfreerdp/core/gateway/http.c b/libfreerdp/core/gateway/http.c
index 51f3c197c..627eeedba 100644
--- a/libfreerdp/core/gateway/http.c
+++ b/libfreerdp/core/gateway/http.c
@@ -339,6 +339,7 @@ BOOL http_context_enable_websocket_upgrade(HttpContext* context, BOOL enable)
 		if (winpr_RAND(key, sizeof(key)) != 0)
 			return FALSE;
 
+		free(context->SecWebsocketKey);
 		context->SecWebsocketKey = crypto_base64_encode(key, sizeof(key));
 		if (!context->SecWebsocketKey)
 			return FALSE;