diff --git a/cmd/blockchaincmd/add_validator.go b/cmd/blockchaincmd/add_validator.go
index 73f841f2b..821cbc5f9 100644
--- a/cmd/blockchaincmd/add_validator.go
+++ b/cmd/blockchaincmd/add_validator.go
@@ -544,6 +544,8 @@ func CallAddValidator(
 		}
 	}
 
+	aggregatorCtx, aggregatorCancel = sdkutils.GetTimedContext(constants.SignatureAggregatorTimeout)
+	defer aggregatorCancel()
 	if err := validatormanager.FinishValidatorRegistration(
 		aggregatorCtx,
 		app,
diff --git a/cmd/blockchaincmd/remove_validator.go b/cmd/blockchaincmd/remove_validator.go
index 34ea1b56a..879172564 100644
--- a/cmd/blockchaincmd/remove_validator.go
+++ b/cmd/blockchaincmd/remove_validator.go
@@ -317,6 +317,8 @@ func removeValidatorSOV(
 		if !force {
 			return fmt.Errorf("validator %s is not eligible for rewards. Use --force flag to force removal", nodeID)
 		}
+		aggregatorCtx, aggregatorCancel = sdkutils.GetTimedContext(constants.SignatureAggregatorTimeout)
+		defer aggregatorCancel()
 		signedMessage, validationID, err = validatormanager.InitValidatorRemoval(
 			aggregatorCtx,
 			app,
@@ -356,6 +358,8 @@ func removeValidatorSOV(
 		}
 	}
 
+	aggregatorCtx, aggregatorCancel = sdkutils.GetTimedContext(constants.SignatureAggregatorTimeout)
+	defer aggregatorCancel()
 	if err := validatormanager.FinishValidatorRemoval(
 		aggregatorCtx,
 		app,
diff --git a/cmd/nodecmd/local.go b/cmd/nodecmd/local.go
index b6e8d81a5..24ec4df15 100644
--- a/cmd/nodecmd/local.go
+++ b/cmd/nodecmd/local.go
@@ -585,6 +585,8 @@ func addAsValidator(network models.Network,
 		}
 	}
 
+	aggregatorCtx, aggregatorCancel = sdkutils.GetTimedContext(constants.SignatureAggregatorTimeout)
+	defer aggregatorCancel()
 	if err := validatormanager.FinishValidatorRegistration(
 		aggregatorCtx,
 		app,