diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index a36e25127..ce9d657bb 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -368,6 +368,7 @@ submissionHelper tid ssh csh shn mcid = do
         buddies <- E.select . E.from $ \(submissionGroup `E.InnerJoin` user) -> do
           E.on . E.exists . E.from $ \submissionGroupUser ->
             E.where_ $ submissionGroupUser E.^. SubmissionGroupUserUser E.==. user E.^. UserId
+                 E.&&. submissionGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId
           E.where_ $ submissionGroup E.^. SubmissionGroupCourse E.==. E.val sheetCourse
           E.where_ . E.exists . E.from $ \submissionGroupUser ->
             E.where_ $ submissionGroupUser E.^. SubmissionGroupUserUser E.==. E.val uid