diff --git a/speedtest.js b/speedtest.js
index 2c4dcaf..bf5d975 100644
--- a/speedtest.js
+++ b/speedtest.js
@@ -299,6 +299,9 @@ Speedtest.prototype = {
           console.error("Speedtest onend event threw exception: " + e);
         }
         clearInterval(this.updater);
+        if(this._settings.mpot){
+            this._settings.telemetry_extra=this._originalExtra;
+        }
         this._state = 4;
       }
     }.bind(this);
@@ -319,6 +322,7 @@ Speedtest.prototype = {
         this._selectedServer.server + this._selectedServer.pingURL;
       this._settings.url_getIp =
         this._selectedServer.server + this._selectedServer.getIpURL;
+      this._originalExtra=this._settings.telemetry_extra;
       if (typeof this._settings.telemetry_extra !== "undefined") {
         this._settings.telemetry_extra = JSON.stringify({
           server: this._selectedServer.name,
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;