diff --git a/app/views/exercises/feedback.html.slim b/app/views/exercises/feedback.html.slim
index bd795872..5d2dcc8b 100644
--- a/app/views/exercises/feedback.html.slim
+++ b/app/views/exercises/feedback.html.slim
@@ -1,6 +1,9 @@
 h1 = link_to(@exercise)
 = row(label: 'exercise.description', value: render_markdown(@exercise.description))
 
+- if @feedbacks.nil? or @feedbacks.size == 0
+  .no-feedback = t('user_exercise_feedback.no_feedback')
+
 ul.list-unstyled.panel-group
   - @feedbacks.each do |feedback|
     li.panel.panel-default
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e4322037..ce03d90f 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -662,6 +662,7 @@ de:
     estimated_time_20_to_30: "zwischen 20 und 30 Minuten"
     estimated_time_more_30: "mehr als 30 Minuten"
     working_time: "Geschätze Bearbeitungszeit für diese Aufgabe:"
+    no_feedback: "Es wurde noch kein Feedback zu dieser Aufgabe gegeben."
   error_templates:
     hints:
       signature: "Ein regulärer Ausdruck in Ruby-Syntax und ohne führende und schließende \"/\""
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 242ea312..be92de5b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -662,6 +662,7 @@ en:
     estimated_time_20_to_30: "between 20 and 30 minutes"
     estimated_time_more_30: "more than 30 minutes"
     working_time: "Estimated time working on this exercise:"
+    no_feedback: "There is no feedback for this exercise yet."
   error_templates:
     hints:
       signature: "A regular expression in Ruby syntax without leading and trailing \"/\""