diff --git a/pkg/repository/v1/match.go b/pkg/repository/v1/match.go
index d156089af..a37dbd950 100644
--- a/pkg/repository/v1/match.go
+++ b/pkg/repository/v1/match.go
@@ -501,6 +501,7 @@ func (m *sharedRepository) processEventMatches(ctx context.Context, tx sqlcv1.DB
 						StepId:             sqlchelpers.UUIDToStr(match.TriggerStepID),
 						StepIndex:          int(match.TriggerStepIndex.Int64),
 						AdditionalMetadata: additionalMetadata,
+						InitialState:       sqlcv1.V1TaskInitialStateQUEUED,
 					}
 
 					switch matchData.Action() {
diff --git a/pkg/repository/v1/task.go b/pkg/repository/v1/task.go
index 4df1804b6..a43c6075a 100644
--- a/pkg/repository/v1/task.go
+++ b/pkg/repository/v1/task.go
@@ -1586,6 +1586,9 @@ func (r *sharedRepository) insertTasks(
 		}
 
 		initialStates[i] = string(task.InitialState)
+		if initialStates[i] == "" {
+			initialStates[i] = string(sqlcv1.V1TaskInitialStateQUEUED)
+		}
 
 		if len(task.AdditionalMetadata) > 0 {
 			additionalMetadatas[i] = task.AdditionalMetadata
@@ -1996,6 +1999,9 @@ func (r *sharedRepository) replayTasks(
 			inputs[i] = r.ToV1StepRunData(task.Input).Bytes()
 		}
 		initialStates[i] = string(task.InitialState)
+		if initialStates[i] == "" {
+			initialStates[i] = string(sqlcv1.V1TaskInitialStateQUEUED)
+		}
 
 		if len(task.AdditionalMetadata) > 0 {
 			additionalMetadatas[i] = task.AdditionalMetadata