diff --git a/redisinsight/ui/src/Router.tsx b/redisinsight/ui/src/Router.tsx
index 225e66791a..c516ad08a2 100644
--- a/redisinsight/ui/src/Router.tsx
+++ b/redisinsight/ui/src/Router.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
-import { BrowserRouter } from 'react-router-dom'
+import { Router as ReactRouter } from 'react-router-dom'
+import { createBrowserHistory } from 'history'
 
 interface Props {
   children: React.ReactElement
@@ -13,8 +14,10 @@ if (RIPROXYPATH !== '') {
   MOUNT_PATH = RIPROXYPATH
 }
 
+export const history = createBrowserHistory({ basename: MOUNT_PATH })
+
 const Router = ({ children }: Props) => (
-  <BrowserRouter basename={MOUNT_PATH}>{children}</BrowserRouter>
+  <ReactRouter history={history}>{children}</ReactRouter>
 )
 
 export default Router
diff --git a/redisinsight/ui/src/slices/store.ts b/redisinsight/ui/src/slices/store.ts
index dc9ad47a57..cefec609ea 100644
--- a/redisinsight/ui/src/slices/store.ts
+++ b/redisinsight/ui/src/slices/store.ts
@@ -1,4 +1,3 @@
-import { createBrowserHistory } from 'history'
 import { configureStore, combineReducers } from '@reduxjs/toolkit'
 
 import { getConfig } from 'uiSrc/config'
@@ -59,8 +58,6 @@ import tagsReducer from './instances/tags'
 
 const riConfig = getConfig()
 
-export const history = createBrowserHistory()
-
 export const rootReducer = combineReducers({
   app: combineReducers({
     info: appInfoReducer,
@@ -149,7 +146,9 @@ const store = configureStore({
   devTools: riConfig.app.env !== 'production',
 })
 
-export { store }
+const dispatch = store.dispatch
+
+export { store, dispatch }
 
 export type ReduxStore = typeof store
 export type RootState = ReturnType<typeof rootReducer>
diff --git a/redisinsight/ui/src/utils/test-store.ts b/redisinsight/ui/src/utils/test-store.ts
index 76611cdbe1..d9ea741712 100644
--- a/redisinsight/ui/src/utils/test-store.ts
+++ b/redisinsight/ui/src/utils/test-store.ts
@@ -1,11 +1,8 @@
-import { createBrowserHistory } from 'history'
-
 import type { ReduxStore } from 'uiSrc/slices/store'
 
 // Re-export all types and exports from the real store to avoid circular dependencies during tests
 
 export type { RootState, AppDispatch, ReduxStore } from 'uiSrc/slices/store'
-export const history = createBrowserHistory()
 
 // Lazy reference to avoid circular dependencies
 // The store will be set by the store module itself after it's created