diff --git a/app/src/main/java/org/digitalcampus/mobile/quiz/Quiz.java b/app/src/main/java/org/digitalcampus/mobile/quiz/Quiz.java
index b285a86c4..be1e55af4 100644
--- a/app/src/main/java/org/digitalcampus/mobile/quiz/Quiz.java
+++ b/app/src/main/java/org/digitalcampus/mobile/quiz/Quiz.java
@@ -65,6 +65,7 @@ public class Quiz implements Serializable {
     public static final int SHOW_FEEDBACK_ALWAYS = 1;
     public static final int SHOW_FEEDBACK_NEVER = 0;
     public static final int SHOW_FEEDBACK_AT_END = 2;
+    public static final int SHOW_FEEDBACK_ONLY_AFTER_QUESTION = 3;
 
     public static final int QUIZ_DEFAULT_PASS_THRESHOLD = 99; // use 99 rather than 100 in case of rounding
     public static final int QUIZ_QUESTION_PASS_THRESHOLD = 99; // use 99 rather than 100 in case of rounding
diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/AnswerWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/AnswerWidget.java
index 4e481e8f2..863daccfd 100644
--- a/app/src/main/java/org/digitalcampus/oppia/widgets/AnswerWidget.java
+++ b/app/src/main/java/org/digitalcampus/oppia/widgets/AnswerWidget.java
@@ -393,7 +393,8 @@ private View.OnClickListener nextBtnClickListener() {
             // save answer
             if (saveAnswer()) {
                 try {
-                    if (quiz.getShowFeedback() == Quiz.SHOW_FEEDBACK_ALWAYS
+                    if ((quiz.getShowFeedback() == Quiz.SHOW_FEEDBACK_ALWAYS ||
+                            quiz.getShowFeedback() == Quiz.SHOW_FEEDBACK_ONLY_AFTER_QUESTION)
                             && !quiz.getCurrentQuestion().getFeedbackDisplayed()) {
 
                         String feedback = quiz.getCurrentQuestion().getFeedback(prefLang);