diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 27453c76..ae3d4fbc 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 class HomeController < ApplicationController
+  include ApplicationHelper
+
   def index
     # redirect_to 'https://dawarich.app', allow_other_host: true and return unless SELF_HOSTED
 
-    redirect_to map_url if current_user
+    redirect_to preferred_map_path if current_user
 
     @points = current_user.points.without_raw_data if current_user
   end
diff --git a/app/controllers/settings/maps_controller.rb b/app/controllers/settings/maps_controller.rb
index 3cee8e0e..f4275f70 100644
--- a/app/controllers/settings/maps_controller.rb
+++ b/app/controllers/settings/maps_controller.rb
@@ -24,6 +24,6 @@ class Settings::MapsController < ApplicationController
   private
 
   def settings_params
-    params.require(:maps).permit(:name, :url, :distance_unit)
+    params.require(:maps).permit(:name, :url, :distance_unit, :preferred_version)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 970a549b..530dc2a7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -142,4 +142,11 @@ module ApplicationHelper
 
     ALLOW_EMAIL_PASSWORD_REGISTRATION
   end
+
+  def preferred_map_path
+    return map_path unless user_signed_in?
+
+    preferred_version = current_user.safe_settings.maps&.dig('preferred_version')
+    preferred_version == 'v2' ? maps_maplibre_path : map_path
+  end
 end
diff --git a/app/views/settings/maps/index.html.erb b/app/views/settings/maps/index.html.erb
index fa8ee555..00c1f63f 100644
--- a/app/views/settings/maps/index.html.erb
+++ b/app/views/settings/maps/index.html.erb
@@ -80,6 +80,23 @@
                     </div>
                   </label>
                 </div>
+                <div class="form-control">
+                  <label class="label cursor-pointer justify-start">
+                    <span class="label-text mr-4 flex items-center">
+                      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-map mr-2 w-4 h-4">
+                        <polygon points="3 6 9 3 15 6 21 3 21 18 15 21 9 18 3 21"></polygon>
+                        <line x1="9" x2="9" y1="3" y2="18"></line>
+                        <line x1="15" x2="15" y1="6" y2="21"></line>
+                      </svg>Preferred Map Version </span>
+                    <div class="flex items-center space-x-2">
+                      <%= f.label :preferred_version_v1, 'V1 (Leaflet)', class: 'cursor-pointer' %>
+                      <%= f.radio_button :preferred_version, 'v1', id: 'maps_preferred_version_v1', class: 'radio radio-primary ml-1 mr-4', checked: @maps['preferred_version'] != 'v2' %>
+                      <%= f.label :preferred_version_v2, 'V2 (MapLibre)', class: 'cursor-pointer' %>
+                      <%= f.radio_button :preferred_version, 'v2', id: 'maps_preferred_version_v2', class: 'radio radio-primary ml-1', checked: @maps['preferred_version'] == 'v2' %>
+                    </div>
+                  </label>
+                  <span class="label-text-alt mt-1">Choose which map version to use by default. V1 uses Leaflet, V2 uses MapLibre with enhanced features.</span>
+                </div>
               </div>
               <div class="bg-base-100 p-5 rounded-lg shadow-sm">
                 <h3 class="font-semibold mb-2">Map Preview</h3>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index e29ad920..fcf869a7 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -5,7 +5,7 @@
         <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h8m-8 6h16" /></svg>
       </label>
       <ul tabindex="0" class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52">
-        <li><%= link_to 'Map', map_url, class: "#{active_class?(map_url)}" %></li>
+        <li><%= link_to 'Map', preferred_map_path, class: "#{active_class?(preferred_map_path)}" %></li>
         <li><%= link_to 'Trips<sup>α</sup>'.html_safe, trips_url, class: "#{active_class?(trips_url)}" %></li>
         <li><%= link_to 'Stats', stats_url, class: "#{active_class?(stats_url)}" %></li>
         <% if user_signed_in? && DawarichSettings.family_feature_enabled? %>
@@ -44,7 +44,7 @@
         <% end %>
       </ul>
     </div>
-    <%= link_to 'Dawarich<sup>α</sup>'.html_safe, root_path, class: 'btn btn-ghost normal-case text-xl'%>
+    <%= link_to 'Dawarich<sup>α</sup>'.html_safe, (user_signed_in? ? preferred_map_path : root_path), class: 'btn btn-ghost normal-case text-xl'%>
     <div class="badge mx-4 <%= 'badge-outline' if new_version_available? %>">
       <a href="https://github.com/Freika/dawarich/releases/latest" target="_blank" class="inline-flex items-center">
         <% if new_version_available? %>
@@ -71,7 +71,7 @@
   </div>
   <div class="navbar-center hidden lg:flex">
     <ul class="menu menu-horizontal px-1">
-      <li><%= link_to 'Map', map_url, class: "mx-1 #{active_class?(map_url)}" %></li>
+      <li><%= link_to 'Map', preferred_map_path, class: "mx-1 #{active_class?(preferred_map_path)}" %></li>
       <li><%= link_to 'Trips<sup>α</sup>'.html_safe, trips_url, class: "mx-1 #{active_class?(trips_url)}" %></li>
       <li><%= link_to 'Stats', stats_url, class: "mx-1 #{active_class?(stats_url)}" %></li>
       <% if user_signed_in? && DawarichSettings.family_feature_enabled? %>