diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index bf53ef002..e814c4bdd 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -63,7 +63,7 @@
                         {% if object.latitude and object.longitude %}
                           {% if config.MAPS_URL %}
                             <div class="position-absolute top-50 end-0 translate-middle-y d-print-none">
-                              <a href="{{ config.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary">
+                              <a href="{{ config.MAPS_URL }}{{ object.latitude|untranslate_decimal_separator }},{{ object.longitude|untranslate_decimal_separator }}" target="_blank" class="btn btn-primary">
                                 <i class="mdi mdi-map-marker"></i> {% trans "Map It" %}
                               </a>
                             </div>
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index d3a44f3ac..7b986283f 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -95,7 +95,7 @@
             {% if object.latitude and object.longitude %}
               {% if config.MAPS_URL %}
                 <div class="position-absolute top-50 end-0 translate-middle-y d-print-none">
-                  <a href="{{ config.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary">
+                  <a href="{{ config.MAPS_URL }}{{ object.latitude|untranslate_decimal_separator }},{{ object.longitude|untranslate_decimal_separator }}" target="_blank" class="btn btn-primary">
                     <i class="mdi mdi-map-marker"></i> {% trans "Map It" %}
                   </a>
                 </div>
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index e8686f8c6..505ee41fe 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -8,7 +8,9 @@ from django.conf import settings
 from django.template.defaultfilters import date
 from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
+from django.utils.formats import get_format
 from django.utils.safestring import mark_safe
+from django.utils.translation import get_language
 
 from core.models import ObjectType
 from utilities.forms import get_selected_values, TableConfigForm
@@ -30,6 +32,7 @@ __all__ = (
     'startswith',
     'status_from_tag',
     'table_config_form',
+    'untranslate_decimal_separator',
     'utilization_graph',
     'validated_viewname',
     'viewname',
@@ -301,3 +304,9 @@ def applied_filters(context, model, form, query_params):
         'applied_filters': applied_filters,
         'save_link': save_link,
     }
+
+
+@register.filter()
+def untranslate_decimal_separator(number: str):
+    decimal_seperator = get_format('DECIMAL_SEPARATOR', get_language())
+    return str(number).replace(decimal_seperator, ".")