diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a77d777..f505c898 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Fix name picker being empty during a reconnect
 - Change wording for more options dropdown and access
 - Fix dropdown position to be on the front of other elements
+- Owner and facilitators of the event can now join the attendee room before the event starts
 
 ## v2.1.1
 
diff --git a/lib/claper_web/live/event_live/show.html.heex b/lib/claper_web/live/event_live/show.html.heex
index ec76aa02..a4223ebe 100644
--- a/lib/claper_web/live/event_live/show.html.heex
+++ b/lib/claper_web/live/event_live/show.html.heex
@@ -1,4 +1,4 @@
-<%= if @started do %>
+<%= if @started || @is_leader do %>
   <div class="relative min-h-screen lg:flex lg:flex-col lg:items-center lg:w-full bg-black lg:bg-gradient-to-tl from-primary-500 to-secondary-500">
     <div class="relative w-full">
       <div