diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 4eb9d96ab..39692163f 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -574,7 +574,7 @@ def fetch_activities_bounded(recipients_to, recipients_cc, opts \\ %{}) do
 
   def upload(file, opts \\ []) do
     with {:ok, data} <- Upload.store(file, opts) do
-      obj_data = (opts[:actor] && Map.put(data, "actor", opts[:actor])) || data
+      obj_data = if opts[:actor], do: Map.put(data, "actor", opts[:actor]), else: data
       Repo.insert(%Object{data: obj_data})
     end
   end