diff --git a/src/declarativeimports/calendar/qml/DayDelegate.qml b/src/declarativeimports/calendar/qml/DayDelegate.qml
index 687715019..635382748 100644
--- a/src/declarativeimports/calendar/qml/DayDelegate.qml
+++ b/src/declarativeimports/calendar/qml/DayDelegate.qml
@@ -46,8 +46,8 @@ MouseArea {
         return result
     }
     readonly property bool selected: {
-        var current = root.currentDate
-        var result = true
+        var current = root.currentDate;
+        var result = true;
         if (dateMatchingPrecision >= Calendar.MatchYear) {
             result = result && current.getFullYear() === thisDate.getFullYear()
         }
@@ -123,10 +123,4 @@ MouseArea {
             ColorAnimation { duration: units.shortDuration * 2 }
         }
     }
-
-    Component.onCompleted: {
-        if (stack.depth === 1 && today) {
-            root.date = model
-        }
-    }
 }
diff --git a/src/declarativeimports/calendar/qml/DaysCalendar.qml b/src/declarativeimports/calendar/qml/DaysCalendar.qml
index 8248a8f5e..d4b8fe4b9 100644
--- a/src/declarativeimports/calendar/qml/DaysCalendar.qml
+++ b/src/declarativeimports/calendar/qml/DaysCalendar.qml
@@ -279,18 +279,9 @@ Item {
         rows: daysCalendar.rows + (daysCalendar.headerModel ? 1 : 0)
 
         spacing: root.borderWidth
-        property Item selectedItem
         property bool containsEventItems: false // FIXME
         property bool containsTodoItems: false // FIXME
 
-        property QtObject selectedDate: root.date
-        onSelectedDateChanged: {
-            // clear the selection if the root.date is null
-            if (calendarGrid.selectedDate == null) {
-                calendarGrid.selectedItem = null;
-            }
-        }
-
         Repeater {
             id: days
 
diff --git a/src/declarativeimports/calendar/qml/MonthView.qml b/src/declarativeimports/calendar/qml/MonthView.qml
index 76c605aea..a2229e5f2 100644
--- a/src/declarativeimports/calendar/qml/MonthView.qml
+++ b/src/declarativeimports/calendar/qml/MonthView.qml
@@ -91,6 +91,7 @@ PinchArea {
 
     function resetToToday() {
         calendarBackend.resetToToday();
+        root.currentDate = root.today;
         stack.pop(null);
     }
 
@@ -243,7 +244,6 @@ PinchArea {
             onActivated: {
                 var rowNumber = Math.floor(index / columns);
                 week = 1 + calendarBackend.weeksModel[rowNumber];
-                root.date = date
                 root.currentDate = new Date(date.yearNumber, date.monthNumber - 1, date.dayNumber)
             }
         }