diff --git a/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js b/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js
index 7130239b3..115675353 100644
--- a/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js
+++ b/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js
@@ -17,7 +17,7 @@ const HorizontalNavBar = React.memo(({ className, route, query, title, backButto
     const navigate = useNavigate();
     const backButtonOnClick = React.useCallback(() => {
         if (originPath) {
-            navigate(originPath);
+            navigate(originPath, { replace: true });
         } else {
             navigate(-1);
         }
diff --git a/src/routes/Addons/useAddonDetailsTransportUrl.js b/src/routes/Addons/useAddonDetailsTransportUrl.js
index 51c66afd8..f60d7ba27 100644
--- a/src/routes/Addons/useAddonDetailsTransportUrl.js
+++ b/src/routes/Addons/useAddonDetailsTransportUrl.js
@@ -16,7 +16,7 @@ const useAddonDetailsTransportUrl = (urlParams) => {
             nextQueryParams.delete('addon');
         }
 
-        setQueryParams(nextQueryParams);
+        setQueryParams(nextQueryParams, { replace: true });
     }, [urlParams, queryParams]);
     return [transportUrl, setTransportUrl];
 };