diff --git a/speedtest.js b/speedtest.js
index 2c4dcaf..8831bdb 100644
--- a/speedtest.js
+++ b/speedtest.js
@@ -72,6 +72,9 @@ Speedtest.prototype = {
     if (this._state != 0)
       throw "You cannot change the test settings after adding server or starting the test";
     this._settings[parameter] = value;
+    if(parameter === "temeletry_extra"){
+        this._originalExtra=this._settings.telemetry_extra;
+    }
   },
   /**
    * Used internally to check if a server object contains all the required elements.
@@ -319,10 +322,10 @@ Speedtest.prototype = {
         this._selectedServer.server + this._selectedServer.pingURL;
       this._settings.url_getIp =
         this._selectedServer.server + this._selectedServer.getIpURL;
-      if (typeof this._settings.telemetry_extra !== "undefined") {
+      if (typeof this._originalExtra !== "undefined") {
         this._settings.telemetry_extra = JSON.stringify({
           server: this._selectedServer.name,
-          extra: this._settings.telemetry_extra
+          extra: this._originalExtra
         });
       } else
         this._settings.telemetry_extra = JSON.stringify({
diff --git a/speedtest_worker.js b/speedtest_worker.js
index ad49571..4451c8f 100644
--- a/speedtest_worker.js
+++ b/speedtest_worker.js
@@ -249,6 +249,7 @@ this.addEventListener("message", function(e) {
 	}
 	if (params[0] === "abort") {
 		// abort command
+        if (testState >= 4) return;
 		tlog("manually aborted");
 		clearRequests(); // stop all xhr activity
 		runNextTest = null;