diff --git a/app/Helpers/translation_helpers.php b/app/Helpers/translation_helpers.php
index d71464b..02dee5d 100644
--- a/app/Helpers/translation_helpers.php
+++ b/app/Helpers/translation_helpers.php
@@ -181,10 +181,7 @@ if (!function_exists('switch_language')) {
         }
 
         app()->setLocale($languageCode);
-        
-        if (auth()->check()) {
-            session(['locale' => $languageCode]);
-        }
+        session(['locale' => $languageCode]);
 
         return true;
     }
diff --git a/resources/views/components/custom/language-selector.blade.php b/resources/views/components/custom/language-selector.blade.php
new file mode 100644
index 0000000..2f6883b
--- /dev/null
+++ b/resources/views/components/custom/language-selector.blade.php
@@ -0,0 +1,36 @@
+@php
+    $languages = available_languages();
+    $currentLang = current_language_code();
+@endphp
+
+<div class="navbar-other w-full !flex !ml-auto">
+    <ul class="navbar-nav !flex-row !items-center !ml-auto">
+      <li class="nav-item dropdown language-select uppercase group">
+        <a class="nav-link dropdown-item dropdown-toggle xl:!text-[.85rem] lg:!text-[.85rem] max-lg:!text-[1.05rem]" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          @php
+              $currentLanguage = $languages->firstWhere('code', $currentLang);
+          @endphp
+          @if($currentLanguage)
+            {{ $currentLanguage->flag ?? '' }} {{ strtoupper($currentLanguage->code) }}
+          @else
+            {{ strtoupper($currentLang) }}
+          @endif
+        </a>
+        <ul class="dropdown-menu group-hover:shadow-[0_0.25rem_0.75rem_rgba(30,34,40,0.15)]">
+          @foreach($languages as $language)
+            <li class="nav-item">
+              <a class="dropdown-item hover:!text-[#747ed1] {{ $language->code === $currentLang ? 'active' : '' }}" 
+                 href="{{ route('language.switch', $language->code) }}">
+                {{ $language->flag ?? '' }} {{ strtoupper($language->code) }}
+              </a>
+            </li>
+          @endforeach
+        </ul>
+      </li>
+      <li class="nav-item"><a class="nav-link" data-bs-toggle="offcanvas" data-bs-target="#offcanvas-info"><i class="uil uil-info-circle before:content-['\eb99'] !text-[1.1rem]"></i></a></li>
+      <li class="nav-item xl:!hidden lg:!hidden">
+        <button class="hamburger offcanvas-nav-btn"><span></span></button>
+      </li>
+    </ul>
+    <!-- /.navbar-nav -->
+  </div>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 2766a28..69f1e62 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -54,6 +54,20 @@ Route::get('/debug-homepage', function () {
     ]);
 });
 
+// Language Switch
+Route::get('/lang/{locale}', function ($locale) {
+    if (function_exists('switch_language')) {
+        switch_language($locale);
+    } else {
+        $language = \App\Models\Language::findByCode($locale);
+        if ($language && $language->is_active) {
+            app()->setLocale($locale);
+            session(['locale' => $locale]);
+        }
+    }
+    return redirect()->back();
+})->name('language.switch');
+
 // Homepage -> admin panelinde "is_homepage" olarak işaretli sayfa dinamik olarak gösterilir
 Route::get('/', [PageController::class, 'index'])->name('homepage');