diff --git a/pkg/routes/caldav/listStorageProvider.go b/pkg/routes/caldav/listStorageProvider.go
index f65a41be24..f1e741102c 100644
--- a/pkg/routes/caldav/listStorageProvider.go
+++ b/pkg/routes/caldav/listStorageProvider.go
@@ -397,6 +397,11 @@ func (vlra *VikunjaListResourceAdapter) CalculateEtag() string {
 	if vlra.task != nil {
 		return `"` + strconv.FormatInt(vlra.task.ID, 10) + `-` + strconv.FormatInt(vlra.task.Updated.Unix(), 10) + `"`
 	}
+
+	if vlra.list == nil {
+		return ""
+	}
+
 	// This also returns the etag of the list, and not of the task,
 	// which becomes problematic because the client uses this etag (= the one from the list) to make
 	// Requests to update a task. These do not match and thus updating a task fails.
@@ -439,6 +444,10 @@ func (vcls *VikunjaCaldavListStorage) getListRessource(isCollection bool) (rr Vi
 	s := db.NewSession()
 	defer s.Close()
 
+	if vcls.list == nil {
+		return
+	}
+
 	can, _, err := vcls.list.CanRead(s, vcls.user)
 	if err != nil {
 		_ = s.Rollback()