diff --git a/app/presenters/member_presenter.rb b/app/presenters/member_presenter.rb
index 388415202..295acbe77 100644
--- a/app/presenters/member_presenter.rb
+++ b/app/presenters/member_presenter.rb
@@ -1,6 +1,6 @@
 class MemberPresenter < BasePresenter
   def organiser?
-    has_role? :organiser, :any
+    @organiser ||= has_role? :organiser, :any
   end
 
   def event_organiser?(event)
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index d36a297aa..bfd89a4e3 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -9,7 +9,7 @@
           - if @user.attending?(event.__getobj__)
             %span.badge.bg-success.mb-3.mb-md-0
               = link_to 'Attending', event.path, class: 'text-light text-decoration-none'
-          - if @user.event_organiser?(event)
+          - if @user.organiser? && @user.event_organiser?(event)
             %span.badge.bg-secondary.mb-3.mb-md-0
               = link_to 'Manage', event.admin_path, class: 'text-light text-decoration-none'
       .order-md-1