diff --git a/routes/admin/agenda.rb b/routes/admin/agenda.rb
index 4406a6a04e35fab66c990c77de697ac91b0bfd4a..bcb6569b4e143f0abbc8e25a0b7e5633a09466f5 100644
--- a/routes/admin/agenda.rb
+++ b/routes/admin/agenda.rb
@@ -10,7 +10,7 @@ get '/:service_space_url_name/admin/agenda/' do
 
 	reservations = Reservation.includes(:user, :resource, :event).in_day(date).order(:start_time).all.to_a
 	reservations.select! do |res|
-		res.event.service_space_id == @space.id
+		(!res.event.nil? && res.event.service_space_id == @space.id) || (!res.resource.nil? && res.resource.service_space_id == @space.id)
 	end
 	events = Event.includes(:event_type).where(:service_space_id => @space.id).in_day(date).order(:start_time)