diff --git a/tabellio/agenda/folder.py b/tabellio/agenda/folder.py
index dbd0ccc..3a1f022 100644
--- a/tabellio/agenda/folder.py
+++ b/tabellio/agenda/folder.py
@@ -134,11 +134,16 @@ class View(grok.View, utils.MonthlyView):
 
     def getMonthEventsWithRepetition(self):
         events = self.getMonthEvents()
+        year, month = self.getYearAndMonthToDisplay()
         for event in events[:]:
             if not event.multidays():
                 continue
+            if event.start.month != month:
+                events.remove(event)
             repeated = event.end.toordinal()-event.start.toordinal()
             for i in range(repeated):
+                if (event.start+datetime.timedelta(i+1)).month != month:
+                    continue
                 # duplicate event with minimal infos
                 new_event = event.__class__()
                 new_event.id = event.id