diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index b725898858..1bfab5cd64 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -206,7 +206,7 @@ class OC_Calendar_Calendar{
 		$stmt->execute(array($id));
 
 		OCP\Util::emitHook('OC_Calendar', 'deleteCalendar', $id);
-		if(count(self::allCalendars()) == 0) {
+		if(count(self::allCalendars(OCP\USER::getUser())) == 0) {
 			self::addCalendar(OCP\USER::getUser(),'Default calendar');
 		}