diff --git a/apps/ifc-example-client/ifc-cli.config.js b/apps/ifc-example-client/ifc-cli.config.js
index 3e927d7..a570571 100644
--- a/apps/ifc-example-client/ifc-cli.config.js
+++ b/apps/ifc-example-client/ifc-cli.config.js
@@ -28,7 +28,10 @@ module.exports = function (frameRouter) {
     },
     envData: {
       locale: "en-US",
-      hostRootUrl: window.location.origin + "/#/",
+      hostRootUrl:
+        window.location.origin +
+        window.location.pathname +
+        window.location.search,
       registeredKeys: [
         { key: "a", ctrlKey: true },
         { key: "b", altKey: true },
diff --git a/package-lock.json b/package-lock.json
index fe0c75a..51cc466 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12384,6 +12384,14 @@
         "vite": "^5.4.2"
       }
     },
+    "packages/iframe-coordinator-cli/node_modules/iframe-coordinator": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/iframe-coordinator/-/iframe-coordinator-6.1.0.tgz",
+      "integrity": "sha512-p7245lFN82SgRPCXom6wAb9Z3Cf7c/gL0GpCkrTJJrEa8/6da1nkzQnBBZopmV3OJ7jid2ij5NgB5wVTZgT/Vw==",
+      "dependencies": {
+        "decoders": "1.15.0"
+      }
+    },
     "packages/iframe-coordinator/node_modules/@rollup/plugin-node-resolve": {
       "version": "15.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.1.tgz",
diff --git a/packages/iframe-coordinator-cli/src/example-ifc.config.js b/packages/iframe-coordinator-cli/src/example-ifc.config.js
index df073c9..aec66cc 100644
--- a/packages/iframe-coordinator-cli/src/example-ifc.config.js
+++ b/packages/iframe-coordinator-cli/src/example-ifc.config.js
@@ -15,7 +15,10 @@ module.exports = function (frameRouter) {
     },
     envData: {
       locale: "en-US",
-      hostRootUrl: window.location.origin,
+      hostRootUrl:
+        window.location.origin +
+        window.location.pathname +
+        window.location.search,
       registeredKeys: [
         { key: "a", ctrlKey: true },
         { key: "b", altKey: true },
diff --git a/packages/iframe-coordinator/src/elements/frame-router.ts b/packages/iframe-coordinator/src/elements/frame-router.ts
index 64f5cf7..7db6dd8 100644
--- a/packages/iframe-coordinator/src/elements/frame-router.ts
+++ b/packages/iframe-coordinator/src/elements/frame-router.ts
@@ -269,10 +269,13 @@ export default class FrameRouterElement extends HTMLElement {
 
   private _processHostUrl(hostUrl: string) {
     const hostUrlObject = new URL(hostUrl);
-    if (hostUrlObject.hash) {
-      return hostUrlObject.href;
+    if (!hostUrlObject.hash) {
+      hostUrlObject.pathname = stripTrailingSlash(hostUrlObject.pathname);
+      if (window.location.hash) {
+        hostUrlObject.pathname += "/";
+        hostUrlObject.hash = "#";
+      }
     }
-    const trimmedUrl = stripTrailingSlash(hostUrl);
-    return window.location.hash ? `${trimmedUrl}/#` : trimmedUrl;
+    return hostUrlObject.href;
   }
 }
diff --git a/packages/iframe-coordinator/src/specs/FrameRouter.spec.ts b/packages/iframe-coordinator/src/specs/FrameRouter.spec.ts
index 3be5e70..40aae6d 100644
--- a/packages/iframe-coordinator/src/specs/FrameRouter.spec.ts
+++ b/packages/iframe-coordinator/src/specs/FrameRouter.spec.ts
@@ -10,6 +10,16 @@ const ENV_DATA_WITH_HASH = {
   hostRootUrl: "https://example.com/root/#/",
 };
 
+const ENV_DATA_WITH_QUERY = {
+  ...ENV_DATA,
+  hostRootUrl: "https://example.com/root/?foo=bar",
+};
+
+const ENV_DATA_WITH_QUERY_AND_HASH = {
+  ...ENV_DATA,
+  hostRootUrl: "https://example.com/root/?foo=bar#/",
+};
+
 describe("The frame router element", () => {
   beforeAll(() => {
     window.customElements.define("frame-router", FrameRouterElement);
@@ -25,7 +35,7 @@ describe("The frame router element", () => {
    * behavior.
    */
   describe("Host URL management", () => {
-    it("Removes a trailing slash on the host URL if present", () => {
+    it("Removes a trailing slash on the host URL if present with no hash", () => {
       const router = new FrameRouterElement();
       router.clientConfig = {
         clients: {},
@@ -65,6 +75,43 @@ describe("The frame router element", () => {
       });
     });
 
-    // TODO: Test expected query behavior here
+    it("Removes trailing slash from pathname when the provided host URL with query params; urlObject and location have no hash", () => {
+      const router = new FrameRouterElement();
+      router.clientConfig = {
+        clients: {},
+        envData: ENV_DATA_WITH_QUERY,
+      };
+      //@ts-ignore
+      expect(router._envData).toEqual({
+        ...ENV_DATA_WITH_QUERY,
+        hostRootUrl: "https://example.com/root?foo=bar",
+      });
+    });
+
+    it("Does not add slash between hash and query params if location has hash; urlObject has no hash", () => {
+      window.location.hash = "foo";
+      const router = new FrameRouterElement();
+      router.clientConfig = {
+        clients: {},
+        envData: ENV_DATA_WITH_QUERY,
+      };
+      //@ts-ignore
+      expect(router._envData).toEqual({
+        ...ENV_DATA_WITH_QUERY,
+        hostRootUrl: "https://example.com/root/?foo=bar#",
+      });
+    });
+
+    it("Does not modify provided host URL with query params if urlObject has hash; location hash N/A", () => {
+      const router = new FrameRouterElement();
+      router.clientConfig = {
+        clients: {},
+        envData: ENV_DATA_WITH_QUERY_AND_HASH,
+      };
+      //@ts-ignore
+      expect(router._envData).toEqual({
+        ...ENV_DATA_WITH_QUERY_AND_HASH,
+      });
+    });
   });
 });