diff --git a/server/proxy/pf_client.c b/server/proxy/pf_client.c
index df464d819..b2daf90cf 100644
--- a/server/proxy/pf_client.c
+++ b/server/proxy/pf_client.c
@@ -98,6 +98,8 @@ static BOOL pf_client_pre_connect(freerdp* instance)
 	 * Only override it if you plan to implement custom order
 	 * callbacks or deactiveate certain features.
 	 */
+	ZeroMemory(instance->settings->OrderSupport, 32);
+
 	/**
 	 * Register the channel listeners.
 	 * They are required to set up / tear down channels if they are loaded.
diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c
index 9be46a977..f2da5652b 100644
--- a/server/proxy/pf_server.c
+++ b/server/proxy/pf_server.c
@@ -239,6 +239,9 @@ static DWORD WINAPI pf_server_handle_client(LPVOID arg)
 		goto out_free_peer;
 	}
 
+
+	ZeroMemory(client->settings->OrderSupport, 32);
+	client->update->autoCalculateBitmapData = FALSE;
 	pdata->ps = ps;
 	/* keep configuration in proxyData */
 	pdata->config = client->ContextExtra;