diff --git a/packages/web-pkg/src/composables/router/useFileRouteReplace.ts b/packages/web-pkg/src/composables/router/useFileRouteReplace.ts
index 7092d6e824..2586d328c5 100644
--- a/packages/web-pkg/src/composables/router/useFileRouteReplace.ts
+++ b/packages/web-pkg/src/composables/router/useFileRouteReplace.ts
@@ -32,7 +32,10 @@ export const useFileRouteReplace = (options: FileRouteReplaceOptions = {}) => {
     }
 
     const routeOptions = createFileRouteOptions(space, resource, { configStore })
-    router.replace(routeOptions)
+    router.replace({
+      ...routeOptions,
+      query: { ...router.currentRoute.value.query, ...routeOptions.query }
+    })
     return true
   }
 
diff --git a/packages/web-runtime/src/pages/resolvePublicLink.vue b/packages/web-runtime/src/pages/resolvePublicLink.vue
index a76cfe3732..25bd03c4c6 100644
--- a/packages/web-runtime/src/pages/resolvePublicLink.vue
+++ b/packages/web-runtime/src/pages/resolvePublicLink.vue
@@ -39,6 +39,7 @@
 <script setup lang="ts">
 import { DavHttpError, PublicLinkType, SharePermissionBit } from '@opencloud-eu/web-client'
 import { authService } from '../services/auth'
+import { parsePathQuery } from '../router/helpers'
 
 import {
   queryItemAsString,
@@ -189,7 +190,7 @@ const resolvePublicLinkTask = useTask(function* (signal, passwordRequired: boole
 
   const url = queryItemAsString(unref(redirectUrl))
   if (url) {
-    router.push({ path: url })
+    router.push(parsePathQuery(url))
     return
   }
 
diff --git a/packages/web-runtime/src/router/helpers.ts b/packages/web-runtime/src/router/helpers.ts
index 13fa51d16c..73a66beccb 100644
--- a/packages/web-runtime/src/router/helpers.ts
+++ b/packages/web-runtime/src/router/helpers.ts
@@ -139,6 +139,19 @@ const getContextRoute = (router: Router, to: RouteLocation): RouteRecordNormaliz
   return router.getRoutes().find((r) => r.name === to.query[contextRouteNameKey])
 }
 
+/**
+ * Splits a URL string into separate path and query parts for use with router.push().
+ * Vue Router's resolve() silently drops query params embedded in the path string,
+ * so they need to be passed via the query field explicitly.
+ */
+export const parsePathQuery = (url: string): { path: string; query?: Record<string, string> } => {
+  if (!url.includes('?')) {
+    return { path: url }
+  }
+  const [path, queryString] = url.split('?')
+  return { path, query: Object.fromEntries(new URLSearchParams(queryString)) }
+}
+
 const getRouteMeta = (to: RouteLocation): WebRouteMeta => {
   if (!to.meta) {
     return {