diff --git a/app/controllers/calendar/calendar.php b/app/controllers/calendar/calendar.php
index 33c41137534b3182b4e7f1637556d46819565d5a..6ae77ebb0850f93fa9fad315f2cc0e9291e4569d 100644
--- a/app/controllers/calendar/calendar.php
+++ b/app/controllers/calendar/calendar.php
@@ -141,6 +141,10 @@ class Calendar_CalendarController extends AuthenticatedController
             } elseif ($user_id) {
                 $calendar_owner = User::getCalendarOwner($user_id);
                 $view = 'single';
+            } else {
+                //Show the calendar of the current user.
+                $view = 'single';
+                $calendar_owner = User::findCurrent();
             }
         } else {
             //Show the calendar of the current user.