diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index ae2fd613..59e6bdee 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -1,13 +1,14 @@
 # Event life cycle
 # This is a central part to this project
 class EventsController < ApplicationController
+  before_action :set_events, only: [:index]
   before_action :set_event, only: [:show, :edit, :update, :cancel, :destroy]
   before_action :check_secret, only: [:edit, :update, :cancel, :destroy]
   before_action :set_mailer_host
 
   def index
     respond_to do |format|
-      format.html { set_events }
+      format.html
       format.rss do
         @events = @events.future_30.includes :related_city
         @events = @events.limit params[:daylimit] if params[:daylimit]