diff --git a/channels/rdpgfx/server/rdpgfx_main.c b/channels/rdpgfx/server/rdpgfx_main.c
index c2fe9e269..aac44d3ca 100644
--- a/channels/rdpgfx/server/rdpgfx_main.c
+++ b/channels/rdpgfx/server/rdpgfx_main.c
@@ -1393,12 +1393,10 @@ static DWORD WINAPI rdpgfx_server_thread_func(LPVOID arg)
 	RdpgfxServerContext* context = (RdpgfxServerContext*)arg;
 	RdpgfxServerPrivate* priv = context->priv;
 	DWORD status;
-	DWORD nCount;
-	void* buffer;
-	HANDLE events[8];
+	DWORD nCount = 0;
+	HANDLE events[8] = { 0 };
 	UINT error = CHANNEL_RC_OK;
-	buffer = NULL;
-	nCount = 0;
+
 	events[nCount++] = priv->stopEvent;
 	events[nCount++] = priv->channelEvent;