diff --git a/jmix-flowui/flowui/src/main/java/io/jmix/flowui/view/navigation/RouteSupport.java b/jmix-flowui/flowui/src/main/java/io/jmix/flowui/view/navigation/RouteSupport.java
index 4004e2bbf0..b963444522 100644
--- a/jmix-flowui/flowui/src/main/java/io/jmix/flowui/view/navigation/RouteSupport.java
+++ b/jmix-flowui/flowui/src/main/java/io/jmix/flowui/view/navigation/RouteSupport.java
@@ -156,15 +156,12 @@ protected void updateQueryParameters(UI ui, String name, List<Object> values,
      */
     public void setQueryParameters(UI ui, QueryParameters queryParameters) {
         Page page = ui.getPage();
-        page.fetchCurrentURL(url -> {
-            log.debug("Fetched URL: {}", url.toString());
 
-            String locationString = resolveLocationString(url);
-            Location newLocation = new Location(locationString, queryParameters);
+        String locationString = getActiveViewLocation(ui).getPath();
+        Location newLocation = new Location(locationString, queryParameters);
 
-            log.debug("Replace URL state with new location: {}", newLocation.getPathWithQueryParameters());
-            page.getHistory().replaceState(null, newLocation, false);
-        });
+        log.debug("Replace URL state with new location: {}", newLocation.getPathWithQueryParameters());
+        page.getHistory().replaceState(null, newLocation);
     }
 
     /**