diff --git a/lib/federation/activity_stream/converter/address.ex b/lib/federation/activity_stream/converter/address.ex
index 7466d42a8..012747f3b 100644
--- a/lib/federation/activity_stream/converter/address.ex
+++ b/lib/federation/activity_stream/converter/address.ex
@@ -24,7 +24,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Address do
     }
 
     res =
-      if is_nil(object["address"]) do
+      if is_nil(object["address"]) or not is_map(object["address"]) do
         res
       else
         Map.merge(res, %{