diff --git a/components/Current/Header/MainMenu/index.tsx b/components/Current/Header/MainMenu/index.tsx
index 00e28adb0..98ed2f19e 100644
--- a/components/Current/Header/MainMenu/index.tsx
+++ b/components/Current/Header/MainMenu/index.tsx
@@ -1,6 +1,5 @@
 "use client"
 import { usePathname } from "next/navigation"
-import { Suspense } from "react"
 import { useIntl } from "react-intl"
 
 import { logout } from "@/constants/routes/handleAuth"
@@ -10,7 +9,6 @@ import useDropdownStore from "@/stores/main-menu"
 import Image from "@/components/Image"
 import LoginButton from "@/components/LoginButton"
 import Avatar from "@/components/MyPages/Avatar"
-import SkeletonShimmer from "@/components/SkeletonShimmer"
 import Link from "@/components/TempDesignSystem/Link"
 import useLang from "@/hooks/useLang"
 import { trackClick } from "@/utils/tracking"
@@ -190,13 +188,7 @@ export function MainMenu({
               ))}
             </ul>
             {languageSwitcher ? (
-              <li className={styles.mobileLi}>
-                <Suspense
-                  fallback={<SkeletonShimmer height="20px" width="10ch" />}
-                >
-                  {languageSwitcher}
-                </Suspense>
-              </li>
+              <li className={styles.mobileLi}>{languageSwitcher}</li>
             ) : null}
             {!!user ? (
               <li className={`${styles.mobileLi} ${styles.logout}`}>
diff --git a/components/Current/Header/TopMenu/index.tsx b/components/Current/Header/TopMenu/index.tsx
index 65700f66c..b33c44424 100644
--- a/components/Current/Header/TopMenu/index.tsx
+++ b/components/Current/Header/TopMenu/index.tsx
@@ -1,11 +1,8 @@
-import { Suspense } from "react"
-
 import { logout } from "@/constants/routes/handleAuth"
 import { overview } from "@/constants/routes/myPages"
 import { getName } from "@/lib/trpc/memoizedRequests"
 
 import LoginButton from "@/components/LoginButton"
-import SkeletonShimmer from "@/components/SkeletonShimmer"
 import Link from "@/components/TempDesignSystem/Link"
 import { getIntl } from "@/i18n"
 import { getLang } from "@/i18n/serverContext"
@@ -35,13 +32,7 @@ export default async function TopMenu({
 
         <ul className={styles.list}>
           {languageSwitcher ? (
-            <li className={styles.langSwitcher}>
-              <Suspense
-                fallback={<SkeletonShimmer height="20px" width="10ch" />}
-              >
-                {languageSwitcher}
-              </Suspense>
-            </li>
+            <li className={styles.langSwitcher}>{languageSwitcher}</li>
           ) : null}
 
           {links.map(({ link }, i) => (
diff --git a/components/Footer/Details/index.tsx b/components/Footer/Details/index.tsx
index 6d170e3d2..b95c20cca 100644
--- a/components/Footer/Details/index.tsx
+++ b/components/Footer/Details/index.tsx
@@ -1,5 +1,3 @@
-import { Suspense } from "react"
-
 import { getFooter, getLanguageSwitcher } from "@/lib/trpc/memoizedRequests"
 
 import { getIconByIconName } from "@/components/Icons/get-icon-by-icon-name"
@@ -88,9 +86,7 @@ export default async function FooterDetails() {
             )}
           </nav>
           {languages?.urls ? (
-            <Suspense fallback={<SkeletonShimmer height="20px" width="10ch" />}>
-              <LanguageSwitcher type="footer" urls={languages.urls} />
-            </Suspense>
+            <LanguageSwitcher type="footer" urls={languages.urls} />
           ) : null}
         </div>
       </div>
diff --git a/components/LanguageSwitcher/LanguageSwitcherContent/index.tsx b/components/LanguageSwitcher/LanguageSwitcherContent/index.tsx
index 19cc69961..51be8f29c 100644
--- a/components/LanguageSwitcher/LanguageSwitcherContent/index.tsx
+++ b/components/LanguageSwitcher/LanguageSwitcherContent/index.tsx
@@ -1,5 +1,6 @@
 "use client"
 
+import { usePathname, useSearchParams } from "next/navigation"
 import { useIntl } from "react-intl"
 
 import { Lang, languages } from "@/constants/languages"
@@ -10,6 +11,8 @@ import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
 import useLang from "@/hooks/useLang"
 import { useTrapFocus } from "@/hooks/useTrapFocus"
 
+import { replaceUrlPart } from "./utils"
+
 import styles from "./languageSwitcherContent.module.css"
 
 import type { LanguageSwitcherContentProps } from "@/types/components/languageSwitcher/languageSwitcher"
@@ -18,12 +21,15 @@ export default function LanguageSwitcherContent({
   urls,
   onLanguageSwitch,
 }: LanguageSwitcherContentProps) {
+  console.log(urls)
   const intl = useIntl()
   const currentLanguage = useLang()
 
   const languageSwitcherRef = useTrapFocus()
   const urlKeys = Object.keys(urls) as Lang[]
 
+  const pathname = usePathname()
+
   return (
     <div className={styles.languageSwitcherContent} ref={languageSwitcherRef}>
       <div className={styles.languageWrapper}>
@@ -39,8 +45,9 @@ export default function LanguageSwitcherContent({
                 <li key={key}>
                   <Link
                     className={`${styles.link} ${isActive ? styles.active : ""}`}
-                    href={url}
+                    href={replaceUrlPart(pathname, url)}
                     onClick={onLanguageSwitch}
+                    keepSearchParams
                   >
                     {languages[key]}
                     {isActive ? <CheckIcon color="burgundy" /> : null}
diff --git a/components/LanguageSwitcher/LanguageSwitcherContent/utils.ts b/components/LanguageSwitcher/LanguageSwitcherContent/utils.ts
new file mode 100644
index 000000000..ee9c27a1d
--- /dev/null
+++ b/components/LanguageSwitcher/LanguageSwitcherContent/utils.ts
@@ -0,0 +1,19 @@
+export function replaceUrlPart(currentPath: string, newPart: string): string {
+  const pathSegments = currentPath.split("/").filter((segment) => segment)
+
+  const newPathSegments = newPart
+    .replace(/\/$/, "")
+    .split("/")
+    .filter((segment) => segment)
+
+  const isFullPathReplacement = newPathSegments.length > 1
+
+  if (isFullPathReplacement) {
+    return `/${newPathSegments.join("/")}`
+  }
+
+  const updatedPathSegments = pathSegments.slice(1)
+  const updatedPath = `/${newPathSegments.concat(updatedPathSegments).join("/")}`
+
+  return updatedPath
+}
diff --git a/components/LanguageSwitcher/index.tsx b/components/LanguageSwitcher/index.tsx
index 16d5e8d41..b69b75d3b 100644
--- a/components/LanguageSwitcher/index.tsx
+++ b/components/LanguageSwitcher/index.tsx
@@ -1,10 +1,9 @@
 "use client"
 
-import { usePathname, useSearchParams } from "next/navigation"
-import { useRef } from "react"
+import { Suspense, useRef } from "react"
 import { useIntl } from "react-intl"
 
-import { Lang, languages } from "@/constants/languages"
+import { languages } from "@/constants/languages"
 import useDropdownStore from "@/stores/main-menu"
 
 import { ChevronDownSmallIcon, GlobeIcon } from "@/components/Icons"
@@ -24,7 +23,6 @@ import {
   type LanguageSwitcherProps,
   LanguageSwitcherTypesEnum,
 } from "@/types/components/languageSwitcher/languageSwitcher"
-import type { LanguageSwitcherData } from "@/types/requests/languageSwitcher"
 
 export default function LanguageSwitcher({
   urls,
@@ -38,23 +36,12 @@ export default function LanguageSwitcher({
     isHeaderLanguageSwitcherMobileOpen,
     isHeaderLanguageSwitcherOpen,
   } = useDropdownStore()
-  const searchParams = useSearchParams()
-  const pathname = usePathname()
-  const queryParams = new URLSearchParams(searchParams.toString())
 
   const languageSwitcherRef = useRef<HTMLDivElement>(null)
   const isFooter = type === LanguageSwitcherTypesEnum.Footer
   const isHeader = !isFooter
   const globeIconSize = type === "desktopHeader" ? 16 : 20
 
-  const currentUrl = `${pathname}?${queryParams.toString()}`
-
-  const fullUrls = Object.entries(urls).reduce((acc, [lang, { url }]) => {
-    const newUrl = currentUrl.replace(/^\/[a-z]{2}\//, url)
-    acc[lang as Lang] = { url: newUrl }
-    return acc
-  }, {} as LanguageSwitcherData)
-
   const position = isFooter ? "footer" : "header"
 
   const dropdownType = {
@@ -119,7 +106,7 @@ export default function LanguageSwitcher({
         {isLanguageSwitcherOpen ? (
           <LanguageSwitcherContainer type={type}>
             <LanguageSwitcherContent
-              urls={fullUrls}
+              urls={urls}
               onLanguageSwitch={() => toggleDropdown(dropdownType)}
             />
           </LanguageSwitcherContainer>