diff --git a/lib/federation/activity_stream/converter/address.ex b/lib/federation/activity_stream/converter/address.ex
index 87b679ac7..9b52dfcaf 100644
--- a/lib/federation/activity_stream/converter/address.ex
+++ b/lib/federation/activity_stream/converter/address.ex
@@ -40,7 +40,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Address do
       res
     else
       geo = %Geo.Point{
-        coordinates: {object["latitude"], object["longitude"]},
+        coordinates: {object["longitude"], object["latitude"]},
         srid: 4326
       }
 
@@ -72,8 +72,8 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Address do
       res
     else
       res
-      |> Map.put("latitude", address.geom.coordinates |> elem(0))
       |> Map.put("longitude", address.geom.coordinates |> elem(1))
+      |> Map.put("latitude", address.geom.coordinates |> elem(0))
     end
   end
 end
diff --git a/lib/mobilizon/addresses/address.ex b/lib/mobilizon/addresses/address.ex
index 2df321757..d1de602b5 100644
--- a/lib/mobilizon/addresses/address.ex
+++ b/lib/mobilizon/addresses/address.ex
@@ -76,7 +76,7 @@ defmodule Mobilizon.Addresses.Address do
   def coords(nil), do: nil
 
   def coords(%__MODULE__{} = address) do
-    with %Geo.Point{coordinates: {latitude, longitude}, srid: 4326} <- address.geom do
+    with %Geo.Point{coordinates: {longitude, latitude}, srid: 4326} <- address.geom do
       {latitude, longitude}
     end
   end