diff --git a/pkg/probo/create_control.go b/pkg/probo/create_control.go
index d4b1406d7..763463795 100644
--- a/pkg/probo/create_control.go
+++ b/pkg/probo/create_control.go
@@ -54,6 +54,7 @@ func (s Service) CreateControl(
 		FrameworkID: req.FrameworkID,
 		Name:        req.Name,
 		Description: req.Description,
+		State:       coredata.ControlStateNotStarted,
 		ContentRef:  req.ContentRef,
 		CreatedAt:   now,
 		UpdatedAt:   now,
@@ -63,7 +64,7 @@ func (s Service) CreateControl(
 		StateTransition: coredata.StateTransition[coredata.ControlState]{
 			ID:        controlStateTransitionID,
 			FromState: nil,
-			ToState:   coredata.ControlStateNotStarted,
+			ToState:   control.State,
 			Reason:    ref.Ref("Initial state"),
 			CreatedAt: now,
 			UpdatedAt: now,