diff --git a/lib/teslamate/locations/geocoder.ex b/lib/teslamate/locations/geocoder.ex
index bb12157e73..f1a253e006 100644
--- a/lib/teslamate/locations/geocoder.ex
+++ b/lib/teslamate/locations/geocoder.ex
@@ -40,7 +40,13 @@ defmodule TeslaMate.Locations.Geocoder do
              namedetails: 1,
              zoom: 19
            ) do
-      {:ok, Enum.map(raw_addresses, &into_address/1)}
+      addresses =
+        Enum.map(raw_addresses, fn attrs ->
+          {:ok, address} = into_address(attrs)
+          address
+        end)
+
+      {:ok, addresses}
     end
   end