diff --git a/internal/manager/persistence/workers.go b/internal/manager/persistence/workers.go
index 16491ef2..a8e73d4e 100644
--- a/internal/manager/persistence/workers.go
+++ b/internal/manager/persistence/workers.go
@@ -75,10 +75,14 @@ func (db *DB) FetchWorker(ctx context.Context, uuid string) (*Worker, error) {
 	w := Worker{}
 	tx := db.gormDB.WithContext(ctx).
 		Preload("Tags").
-		First(&w, "uuid = ?", uuid)
+		Find(&w, "uuid = ?", uuid).
+		Limit(1)
 	if tx.Error != nil {
 		return nil, workerError(tx.Error, "fetching worker")
 	}
+	if w.ID == 0 {
+		return nil, ErrWorkerNotFound
+	}
 	return &w, nil
 }