diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
index 63923265fd836bea1516be81a922ec955525332a..0f59f9b28e278874b5f81761830a979e08182d32 100644
--- a/ui/vnc-tls.c
+++ b/ui/vnc-tls.c
@@ -444,8 +444,6 @@ static int vnc_set_x509_credential(VncDisplay *vd,
     struct stat sb;
 
     g_free(*cred);
-    *cred = NULL;
-
     *cred = g_malloc(strlen(certdir) + strlen(filename) + 2);
 
     strcpy(*cred, certdir);
diff --git a/ui/vnc.c b/ui/vnc.c
index f8d9b7db9571e04cf4fd361853ac205f470f4be2..0fe6eff1b8a661d7cb123b37bb49921c72d5df16 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2914,6 +2914,7 @@ static void vnc_listen_read(void *opaque, bool websocket)
     }
 
     if (csock != -1) {
+        socket_set_nodelay(csock);
         vnc_connect(vs, csock, false, websocket);
     }
 }