diff --git a/app/models/conference.rb b/app/models/conference.rb
index db77eaae..fec05c77 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -20,7 +20,7 @@ class Conference < ActiveRecord::Base
 
   has_paper_trail
 
-  has_many :questions
+  has_and_belongs_to_many :questions
 
   has_one :splashpage, dependent: :destroy
   has_one :contact, dependent: :destroy