diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 9cd6ad2851..ca897a36dc 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -406,7 +406,9 @@ class OC_Calendar_App{
 				$return[] = array_merge($staticoutput, $dynamicoutput);
 			}
 		}else{
-			$object->expand($start, $end);
+			if(OC_Calendar_Object::isrepeating($id) || $event['repeating'] == 1){
+				$object->expand($start, $end);
+			}
 			foreach($object->getComponents() as $singleevent){
 				if(!($singleevent instanceof Sabre_VObject_Component_VEvent)){
 					continue;