diff --git a/app/models/request_for_comment.rb b/app/models/request_for_comment.rb
index 4be7d325..22b39b39 100644
--- a/app/models/request_for_comment.rb
+++ b/app/models/request_for_comment.rb
@@ -4,6 +4,8 @@ class RequestForComment < ActiveRecord::Base
   belongs_to :exercise
   belongs_to :file, class_name: 'CodeOcean::File'
 
+  has_many :comments, through: :submission
+
   scope :unsolved, -> { where(solved: [false, nil]) }
 
     def self.last_per_user(n = 5)
diff --git a/app/models/submission.rb b/app/models/submission.rb
index 6815eb40..94ba46d6 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -8,6 +8,7 @@ class Submission < ActiveRecord::Base
   belongs_to :exercise
 
   has_many :testruns
+  has_many :comments, through: :files
 
   delegate :execution_environment, to: :exercise