diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
index 26f170f86bec..72145c1c0f67 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java
@@ -102,7 +102,7 @@ public abstract class Exercise extends BaseExercise implements LearningObject {
     private Boolean secondCorrectionEnabled = false;
 
     @Column(name = "feedback_suggestions_enabled") // enables Athena
-    private boolean feedbackSuggestionsEnabled = false;
+    private Boolean feedbackSuggestionsEnabled = false;
 
     @ManyToOne
     @JsonView(QuizView.Before.class)
@@ -784,7 +784,7 @@ public void setSecondCorrectionEnabled(boolean secondCorrectionEnabled) {
     }
 
     public boolean getFeedbackSuggestionsEnabled() {
-        return feedbackSuggestionsEnabled;
+        return Boolean.TRUE.equals(feedbackSuggestionsEnabled);
     }
 
     public void setFeedbackSuggestionsEnabled(boolean feedbackSuggestionsEnabled) {