diff --git a/src/services/task.js b/src/services/task.js
index afbd71b8a..e63cadb51 100644
--- a/src/services/task.js
+++ b/src/services/task.js
@@ -17,9 +17,9 @@ export default class TaskService extends AbstractService {
 
 	beforeUpdate(model) {
 		// Convert the date in a unix timestamp
-		model.dueDate = (+ new Date(model.dueDate)) / 1000
-		model.startDate = (+ new Date(model.startDate)) / 1000
-		model.endDate = (+ new Date(model.endDate)) / 1000
+		model.dueDate = +new Date(model.dueDate) / 1000
+		model.startDate = +new Date(model.startDate) / 1000
+		model.endDate = +new Date(model.endDate) / 1000
 
 		// remove all nulls, these would create empty reminders
 		for (const index in model.reminderDates) {
@@ -30,7 +30,7 @@ export default class TaskService extends AbstractService {
 
 		// Make normal timestamps from js dates
 		model.reminderDates = model.reminderDates.map(r => {
-			return Math.round(r / 1000)
+			return Math.round(+new Date(r) / 1000)
 		})
 
 		// Make the repeating amount to seconds