diff --git a/src/Calendar/Views.tsx b/src/Calendar/Views.tsx
index aae5a23..a65d6c4 100644
--- a/src/Calendar/Views.tsx
+++ b/src/Calendar/Views.tsx
@@ -289,6 +289,7 @@ export class CalendarComponent extends BaseComponent<ICalendarHubProps, Calendar
             this.calendarView = Controls.create(CalendarView, $(this.calendarDiv), {
                 selectedTeam: this.props.selectedTeam,
             } as CalendarViewOptions);
+            this.calendarView.getCalendar().goTo(new Date(this.state.calendar.year, this.state.calendar.month, 1, 0, 0, 0));
             this.props.onCalendarViewUpdated(this.calendarView);
         }
     }
@@ -1109,7 +1110,7 @@ export class SummaryView extends Controls.BaseControl {
         this._calendar.addCallback(Calendar.FullCalendarCallbackType.eventAfterAllRender, () => {
             if (!this._disposed) {
                 EventSourceCollection.create().then((eventSources: EventSourceCollection) => {
-                    if (!this._rendering) {
+                    if (!this._rendering && !this._disposed) {
                         this._rendering = true;
                         this._loadSections(eventSources);
                     }
diff --git a/vss-extension.json b/vss-extension.json
index 0099a5a..66d47b0 100644
--- a/vss-extension.json
+++ b/vss-extension.json
@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "team-calendar",
     "publisher": "ms-devlabs",
-    "version": "0.5.198",
+    "version": "0.5.209",
     "name": "Team Calendar",
     "description": "Track events important to your team, view and manage days off, quickly see when sprints start and end, and more.",
     "public": true,