diff --git a/app/models/event.rb b/app/models/event.rb
index 4e8e99dc..7b701c1f 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -167,7 +167,7 @@ def date_ranges_attributes=(*args)
     event.date_ranges.each do |date_range|
       next if date_range.valid?
       date_range.errors.full_messages.each do |msg|
-        errors.add :date_ranges, msg
+        errors.add :date_ranges, msg unless errors[:date_ranges].include? msg
       end
     end
   end
diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
index c335f382..4202142f 100644
--- a/app/views/events/_form.html.erb
+++ b/app/views/events/_form.html.erb
@@ -37,7 +37,7 @@
   </div>
   <div class="form-group">
     <%= f.label :date_ranges, :class => 'control-label col-lg-2' %>
-    <div class="col-lg-10" id="event-date-pickers">
+    <div class="col-lg-10 <%= 'has-error' unless @event.errors.messages[:date_ranges].empty? %>" id="event-date-pickers">
       <% def date_picker_template(start_date = Date.current, end_date = Date.current)
         start_picker = text_field_tag "event[date_ranges_attributes][][start_date]", (I18n.l start_date),
           class: 'form-control', :"data-enable-datepicker" => 'true'
diff --git a/spec/features/event_spec.rb b/spec/features/event_spec.rb
index e84af04d..59c69393 100644
--- a/spec/features/event_spec.rb
+++ b/spec/features/event_spec.rb
@@ -97,6 +97,29 @@
 
       expect(page).to have_text("Bewerbungsschluss muss vor Beginn der Veranstaltung liegen")
     end
+
+    it "should not display errors on date ranges twice", js: true do
+      visit new_event_path
+
+      fill_in "Maximale Teilnehmerzahl", :with => 25
+
+      within page.find("#event-date-pickers").all("div")[0] do
+        fill_in "event[date_ranges_attributes][][start_date]", with: I18n.l(Date.current.prev_day(7))
+        fill_in "event[date_ranges_attributes][][end_date]", with: I18n.l(Date.yesterday.prev_day(7))
+      end
+
+      click_link "Zeitspanne hinzufügen"
+
+      within page.find("#event-date-pickers").all("div")[1] do
+        fill_in "event[date_ranges_attributes][][start_date]", with: I18n.l(Date.current)
+        fill_in "event[date_ranges_attributes][][end_date]", with: I18n.l(Date.yesterday)
+      end
+
+      click_button I18n.t(".events.form.publish")
+
+      expect(page).to have_css("div.has-error")
+      expect(page).to have_content("kann nicht vor Start-Datum liegen", count: 1)
+    end
   end
 
   describe "show page" do