diff --git a/lib/mobilizon/events/comment.ex b/lib/mobilizon/events/comment.ex
index 3856d1c2c..a9c9b7869 100644
--- a/lib/mobilizon/events/comment.ex
+++ b/lib/mobilizon/events/comment.ex
@@ -8,9 +8,11 @@ defmodule Mobilizon.Events.Comment do
   import Ecto.Changeset
 
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Config
   alias Mobilizon.Events.{Comment, CommentVisibility, Event}
 
+  alias MobilizonWeb.Router.Helpers, as: Routes
+  alias MobilizonWeb.Endpoint
+
   @type t :: %__MODULE__{
           text: String.t(),
           url: String.t(),
@@ -66,5 +68,5 @@ defmodule Mobilizon.Events.Comment do
   end
 
   @spec generate_url(String.t()) :: String.t()
-  defp generate_url(uuid), do: "#{Config.instance_hostname()}/comments/#{uuid}"
+  defp generate_url(uuid), do: Routes.page_url(Endpoint, :comment, uuid)
 end
diff --git a/lib/mobilizon/events/participant.ex b/lib/mobilizon/events/participant.ex
index 93a5a2588..c3d851e18 100644
--- a/lib/mobilizon/events/participant.ex
+++ b/lib/mobilizon/events/participant.ex
@@ -8,10 +8,11 @@ defmodule Mobilizon.Events.Participant do
   import Ecto.Changeset
 
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Config
   alias Mobilizon.Events
   alias Mobilizon.Events.{Event, ParticipantRole}
 
+  alias MobilizonWeb.Endpoint
+
   @type t :: %__MODULE__{
           role: ParticipantRole.t(),
           url: String.t(),
@@ -82,5 +83,5 @@ defmodule Mobilizon.Events.Participant do
   end
 
   @spec generate_url(String.t()) :: String.t()
-  defp generate_url(uuid), do: "#{Config.instance_hostname()}/join/event/#{uuid}"
+  defp generate_url(uuid), do: "#{Endpoint.url()}/join/event/#{uuid}"
 end