diff --git a/lib/server.c b/lib/server.c
index 5f8749fc..d6a65cf0 100644
--- a/lib/server.c
+++ b/lib/server.c
@@ -731,8 +731,10 @@ int lws_server_socket_service(struct libwebsocket_context *context,
 		break;
 	}
 
-	if (lws_server_socket_service_ssl(context, &wsi, new_wsi, accept_fd, pollfd))
-		goto fail;
+	if (new_wsi)
+		if (lws_server_socket_service_ssl(context, &wsi, new_wsi,
+						  accept_fd, pollfd))
+			goto fail;
 
 	return 0;