diff --git a/src/main/java/nl/tudelft/ewi/devhub/server/database/controllers/CommitComments.java b/src/main/java/nl/tudelft/ewi/devhub/server/database/controllers/CommitComments.java
index 1c58685a..e7e0f745 100644
--- a/src/main/java/nl/tudelft/ewi/devhub/server/database/controllers/CommitComments.java
+++ b/src/main/java/nl/tudelft/ewi/devhub/server/database/controllers/CommitComments.java
@@ -31,7 +31,7 @@ public CommitComments(final EntityManager entityManager) {
     @Transactional
     public List<CommitComment> getCommentsFor(Group group, String... commitIds) {
         return query().from(commitComment)
-                .where(commitComment.source.isNull()
+                .where(commitComment.source.sourceFilePath.isNull()
                         .and(commitComment.commit.repository.eq(group)
                                 .and(commitComment.commit.commitId.in(commitIds))))
             .list(commitComment);
@@ -46,7 +46,7 @@ public List<CommitComment> getCommentsFor(Group group, String... commitIds) {
     @Transactional
     public List<CommitComment> getCommentsFor(Group group, List<String> commitIds) {
         return query().from(commitComment)
-                .where(commitComment.source.isNull()
+                .where(commitComment.source.sourceFilePath.isNull()
                         .and(commitComment.commit.repository.eq(group)
                                 .and(commitComment.commit.commitId.in(commitIds))))
                 .list(commitComment);
@@ -61,7 +61,7 @@ public List<CommitComment> getCommentsFor(Group group, List<String> commitIds) {
     @Transactional
     public List<CommitComment> getInlineCommentsFor(Group group, Collection<String> commitIds) {
         return query().from(commitComment)
-            .where(commitComment.source.isNotNull()
+            .where(commitComment.source.sourceFilePath.isNotNull()
                     .and(commitComment.commit.repository.eq(group)
                             .and(commitComment.commit.commitId.in(commitIds))))
             .list(commitComment);