diff --git a/frontend/app/components/UsabilityTesting/TestEdit.tsx b/frontend/app/components/UsabilityTesting/TestEdit.tsx
index 8e732c7c1..5215471fc 100644
--- a/frontend/app/components/UsabilityTesting/TestEdit.tsx
+++ b/frontend/app/components/UsabilityTesting/TestEdit.tsx
@@ -51,7 +51,7 @@ function TestEdit() {
   usePageTitle(`Usability Tests | ${uxtestingStore.instance ? 'Edit' : 'Create'}`);
 
   React.useEffect(() => {
-    if (siteId !== uxtestingStore.instanceCreationSiteId) {
+    if (uxtestingStore.instanceCreationSiteId && siteId !== uxtestingStore.instanceCreationSiteId) {
       history.push(withSiteId(usabilityTesting(), siteId));
     }
   }, [siteId]);
diff --git a/tracker/tracker/package.json b/tracker/tracker/package.json
index 6b2011444..ae74ff6f3 100644
--- a/tracker/tracker/package.json
+++ b/tracker/tracker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openreplay/tracker",
   "description": "The OpenReplay tracker main package",
-  "version": "11.0.2-13",
+  "version": "11.0.2-15",
   "keywords": [
     "logging",
     "replay"
diff --git a/tracker/tracker/src/main/app/index.ts b/tracker/tracker/src/main/app/index.ts
index 8915fe297..fc4b47205 100644
--- a/tracker/tracker/src/main/app/index.ts
+++ b/tracker/tracker/src/main/app/index.ts
@@ -737,13 +737,18 @@ export default class App {
           }
         }
 
-        if (uxtId && !this.uxtManager.isActive) {
-          // eslint-disable-next-line
-          this.uxtManager.getTest(uxtId, token, Boolean(savedUxtTag)).then((id) => {
-            if (id) {
-              this.onUxtCb.forEach((cb: (id: number) => void) => cb(id))
-            }
-          })
+        if (uxtId) {
+          if (!this.uxtManager.isActive) {
+            // eslint-disable-next-line
+            this.uxtManager.getTest(uxtId, token, Boolean(savedUxtTag)).then((id) => {
+              if (id) {
+                this.onUxtCb.forEach((cb: (id: number) => void) => cb(id))
+              }
+            })
+          } else {
+            // @ts-ignore
+            this.onUxtCb.forEach((cb: (id: number) => void) => cb(uxtId))
+          }
         }
 
         return SuccessfulStart(onStartInfo)