diff --git a/src/addon/calendar/components/upcoming-events/upcoming-events.ts b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
index d540dae6e..74db1aebc 100644
--- a/src/addon/calendar/components/upcoming-events/upcoming-events.ts
+++ b/src/addon/calendar/components/upcoming-events/upcoming-events.ts
@@ -264,7 +264,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges,
             return this.onlineEvents;
         }
 
-        const start = Date.now(),
+        const start = Date.now() / 1000,
             end = start + (CoreConstants.SECONDS_DAY * this.lookAhead);
         let result = this.onlineEvents;
 
diff --git a/src/addon/calendar/providers/calendar.ts b/src/addon/calendar/providers/calendar.ts
index 5ffe6d29d..7b09df4a8 100644
--- a/src/addon/calendar/providers/calendar.ts
+++ b/src/addon/calendar/providers/calendar.ts
@@ -727,7 +727,7 @@ export class AddonCalendarProvider {
             return this.userProvider.getUserPreference('calendar_lookahead').catch((error) => {
                 // Ignore errors.
             }).then((value): any => {
-                if (typeof value != 'undefined') {
+                if (value != null) {
                     return value;
                 }