diff --git a/src/components/map/ha-location-editor.ts b/src/components/map/ha-location-editor.ts
index 9f3d45c01aad..0d4133b8327f 100644
--- a/src/components/map/ha-location-editor.ts
+++ b/src/components/map/ha-location-editor.ts
@@ -77,7 +77,12 @@ class LocationEditor extends LitElement {
   }
 
   private _updateLocation(latlng: LatLng) {
-    this.location = this._ignoreFitToMap = [latlng.lat, latlng.lng];
+    let longitude = latlng.lng;
+    if (Math.abs(longitude) > 180.0) {
+      // Normalize longitude if map provides values beyond -180 to +180 degrees.
+      longitude = (((longitude % 360.0) + 540.0) % 360.0) - 180.0;
+    }
+    this.location = this._ignoreFitToMap = [latlng.lat, longitude];
     fireEvent(this, "change", undefined, { bubbles: false });
   }