diff --git a/lib/common/http-client.ts b/lib/common/http-client.ts
index 84efc0bdb5..a8bc49acb3 100644
--- a/lib/common/http-client.ts
+++ b/lib/common/http-client.ts
@@ -98,12 +98,15 @@ export class HttpClient implements Server.IHttpClient {
 
 		this.$logger.trace("httpRequest: %s", util.inspect(options));
 
-		const agent = tunnel.httpsOverHttp({
-			proxy: {
-				host: cliProxySettings.hostname,
-				port: parseInt(cliProxySettings.port),
-			},
-		});
+		let agent;
+		if (cliProxySettings) {
+			agent = tunnel.httpsOverHttp({
+				proxy: {
+					host: cliProxySettings.hostname,
+					port: parseInt(cliProxySettings.port),
+				},
+			});
+		}
 		const result = await axios({
 			url: options.url,
 			headers: options.headers,
diff --git a/lib/services/test-execution-service.ts b/lib/services/test-execution-service.ts
index 472bb06212..653201a1f2 100644
--- a/lib/services/test-execution-service.ts
+++ b/lib/services/test-execution-service.ts
@@ -81,7 +81,7 @@ export class TestExecutionService implements ITestExecutionService {
 						liveSyncInfo.projectDir,
 						TestExecutionService.SOCKETIO_JS_FILE_NAME
 					),
-					socketIoJs
+					JSON.parse(socketIoJs)
 				);
 			}