diff --git a/pkg/models/listeners.go b/pkg/models/listeners.go
index b4f90fc12..d07de9ab4 100644
--- a/pkg/models/listeners.go
+++ b/pkg/models/listeners.go
@@ -448,17 +448,17 @@ func (s *HandleTaskUpdateLastUpdated) Handle(msg *message.Message) (err error) {
 	}
 
 	var taskIDInt int64
-	switch taskID.(type) {
+	switch v := taskID.(type) {
 	case int64:
-		taskIDInt = taskID.(int64)
+		taskIDInt = v
 	case int:
-		taskIDInt = int64(taskID.(int))
+		taskIDInt = int64(v)
 	case int32:
-		taskIDInt = int64(taskID.(int32))
+		taskIDInt = int64(v)
 	case float64:
-		taskIDInt = int64(taskID.(float64))
+		taskIDInt = int64(v)
 	case float32:
-		taskIDInt = int64(taskID.(float32))
+		taskIDInt = int64(v)
 	default:
 		log.Errorf("Event payload does not contain a valid task ID")
 		return
diff --git a/pkg/models/task_attachment.go b/pkg/models/task_attachment.go
index 41041129c..02976f884 100644
--- a/pkg/models/task_attachment.go
+++ b/pkg/models/task_attachment.go
@@ -17,10 +17,11 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/events"
 	"io"
 	"time"
 
+	"code.vikunja.io/api/pkg/events"
+
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
diff --git a/pkg/models/task_relation.go b/pkg/models/task_relation.go
index 4f587dcd1..afd0c1a08 100644
--- a/pkg/models/task_relation.go
+++ b/pkg/models/task_relation.go
@@ -17,9 +17,10 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/events"
 	"time"
 
+	"code.vikunja.io/api/pkg/events"
+
 	"xorm.io/builder"
 	"xorm.io/xorm"