diff --git a/app/controllers/api/v1/events_controller.rb b/app/controllers/api/v1/events_controller.rb
index bfcf9705..a942f189 100644
--- a/app/controllers/api/v1/events_controller.rb
+++ b/app/controllers/api/v1/events_controller.rb
@@ -5,10 +5,10 @@ module Api
       respond_to :json
 
       def index
-        events = Event.includes(:conference, :track, :room, :event_type, event_users: :user)
+        events = Event.includes(:track, :room, :event_type, event_users: :user)
 
         if @conference
-          events = events.where(conference: @conference)
+          events = events.where(program: @conference.program)
         end
 
         respond_with events.confirmed
diff --git a/app/controllers/api/v1/speakers_controller.rb b/app/controllers/api/v1/speakers_controller.rb
index b240fb82..b0eb9cf6 100644
--- a/app/controllers/api/v1/speakers_controller.rb
+++ b/app/controllers/api/v1/speakers_controller.rb
@@ -6,7 +6,7 @@ module Api
 
       def index
         if @conference
-          users = User.joins(event_users: { event: :conference })
+          users = User.joins(event_users: { event: { program: :conference} })
           users = users.where(conferences: { short_title: @conference.short_title })
         else
           users = User.joins(:event_users)