diff --git a/packages/trace-viewer/src/settings.ts b/packages/trace-viewer/src/settings.ts
index e4277347f5..82ffe768ed 100644
--- a/packages/trace-viewer/src/settings.ts
+++ b/packages/trace-viewer/src/settings.ts
@@ -14,7 +14,5 @@
  * limitations under the License.
  */
 
-const searchParams = new URLSearchParams(window.location.search);
-
-export const testServerBaseURL = new URL(self.location.href);
-testServerBaseURL.port = searchParams.get('testServerPort') ?? testServerBaseURL.port;
+export const testServerBaseURL = new URL(window.location.href);
+testServerBaseURL.port = testServerBaseURL.searchParams.get('testServerPort') ?? testServerBaseURL.port;
diff --git a/packages/trace-viewer/src/ui/DEPS.list b/packages/trace-viewer/src/ui/DEPS.list
index 0056375c05..6cbc852992 100644
--- a/packages/trace-viewer/src/ui/DEPS.list
+++ b/packages/trace-viewer/src/ui/DEPS.list
@@ -4,6 +4,7 @@
 @trace/**
 @web/**
 ../entries.ts
+../settings.ts
 ../geometry.ts
 ../../../playwright/src/isomorphic/**
 ../third_party/devtools.ts