diff --git a/app/state_test.go b/app/state_test.go
index 47fed0fac..33e4eb9ba 100644
--- a/app/state_test.go
+++ b/app/state_test.go
@@ -4162,6 +4162,46 @@ var stateTransitionsWithUpdateModulesTestCases []stateTransitionsWithUpdateModul
 			&updateRollbackRebootState{},
 			&updateVerifyRollbackRebootState{},
 			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
+			&updateVerifyRollbackRebootState{},
+			&updateRollbackRebootState{},
 			// Truncated after maximum number of state transitions.
 			&updateStatusReportState{},
 			&idleState{},
@@ -4222,6 +4262,86 @@ var stateTransitionsWithUpdateModulesTestCases []stateTransitionsWithUpdateModul
 			"ArtifactRollbackReboot",
 			"ArtifactVerifyRollbackReboot",
 			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
+			"ArtifactRollbackReboot_Enter_00",
+			"ArtifactRollbackReboot",
+			"ArtifactVerifyRollbackReboot",
+			"ArtifactRollbackReboot_Leave_00",
 			// Truncated after maximum number of state transitions.
 		},
 		reportsLog: []string{
@@ -4259,6 +4379,26 @@ var stateTransitionsWithUpdateModulesTestCases []stateTransitionsWithUpdateModul
 			&updateErrorState{},
 			&updateErrorState{},
 			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
+			&updateErrorState{},
 			// Truncated after maximum number of state transitions.
 			&updateStatusReportState{},
 			&idleState{},
@@ -4301,6 +4441,46 @@ var stateTransitionsWithUpdateModulesTestCases []stateTransitionsWithUpdateModul
 			"ArtifactFailure",
 			"ArtifactFailure_Enter_00",
 			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
+			"ArtifactFailure_Enter_00",
+			"ArtifactFailure",
 			// Truncated after maximum number of state transitions.
 		},
 		reportsLog: []string{
diff --git a/datastore/datastore.go b/datastore/datastore.go
index 208225f18..8dec15480 100644
--- a/datastore/datastore.go
+++ b/datastore/datastore.go
@@ -24,10 +24,12 @@ import (
 const (
 	errMsgReadingFromStoreF = "Error reading %q from datastore."
 
-	// This number should be kept quite a lot higher than the number of
+	// This number 30 should be kept quite a lot higher than the number of
 	// expected state storage operations, which is usually roughly
-	// equivalent to the number of state transitions.
-	MaximumStateDataStoreCount = 30
+	// equivalent to the number of state transitions. 40 is added as an
+	// extra buffer for StatusReportRetry states, which can run up to 10
+	// times each (10 * two states * enter and exit state = 10 * 2 * 2 = 40)
+	MaximumStateDataStoreCount = 30 + 40
 )
 
 var (