diff --git a/lib/mobilizon/events/event.ex b/lib/mobilizon/events/event.ex
index fcd1ea745..71820ee80 100644
--- a/lib/mobilizon/events/event.ex
+++ b/lib/mobilizon/events/event.ex
@@ -187,8 +187,8 @@ defmodule Mobilizon.Events.Event do
 
   # In case the provided addresses is an existing one
   @spec put_address(Changeset.t(), map) :: Changeset.t()
-  defp put_address(%Changeset{} = changeset, %{physical_address: %{id: id} = _physical_address}) do
-    case Addresses.get_address!(id) do
+  defp put_address(%Changeset{} = changeset, %{physical_address: %{id: id} = _physical_address}) when not is_nil(id) do
+    case Addresses.get_address(id) do
       %Address{} = address ->
         put_assoc(changeset, :physical_address, address)