diff --git a/Plugin/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/Plugin/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
index 4456cfb..9b3a2bb 100644
--- a/Plugin/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
+++ b/Plugin/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -67,6 +67,10 @@ public function beforeSwitch(
         $temp = explode('/',$redirectUrlTemp,5);
         if (rtrim($temp[3],'/') ==  rtrim(end($temp),'/'))
         {
+            if (strpos(rtrim($redirectUrl, '/'), rtrim($targetStore->getBaseUrl(),'/')) === false) {
+                $redirectUrl = $targetStore->getBaseUrl();
+                return [$fromStore,$targetStore,$redirectUrl];
+            }
             return $return;
         }
         unset($temp);