diff --git a/server/handler/syncHandler.go b/server/handler/syncHandler.go
index 69b7e5c..8471ca7 100644
--- a/server/handler/syncHandler.go
+++ b/server/handler/syncHandler.go
@@ -3,6 +3,7 @@ package handler
 import (
 	"encoding/json"
 	"net/http"
+	"time"
 
 	"gitea.kleinsense.nl/DariusKlein/kleinTodo/common"
 	"gitea.kleinsense.nl/DariusKlein/kleinTodo/common/jwt"
@@ -33,6 +34,9 @@ func SyncHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	for _, clientTodo := range todoList.Todos {
+		if clientTodo.LastModified.IsZero() {
+			clientTodo.LastModified = time.Now().UTC()
+		}
 		serverTodo, exists := serverTodos[clientTodo.Id]
 
 		if !exists {
@@ -66,6 +70,7 @@ func SyncHandler(w http.ResponseWriter, r *http.Request) {
 					ServerTodo: serverTodo,
 					LocalTodo:  clientTodo,
 				})
+				delete(serverTodos, clientTodo.Id)
 			}
 		}
 	}