diff --git a/agent/consul/fsm/commands_oss.go b/agent/consul/fsm/commands_oss.go
index f6739128c4..42222d9a00 100644
--- a/agent/consul/fsm/commands_oss.go
+++ b/agent/consul/fsm/commands_oss.go
@@ -457,7 +457,7 @@ func (c *FSM) applyConnectCAOperation(buf []byte, index uint64) interface{} {
 			return act
 		}
 
-		return c.state.CACheckAndSetConfig(index+1, req.Index, req.Config)
+		return c.state.CASetConfig(index, req.Config)
 
 	case structs.CAOpIncrementProviderSerialNumber:
 		sn, err := c.state.CAIncrementProviderSerialNumber(index)
diff --git a/agent/consul/leader_connect_ca.go b/agent/consul/leader_connect_ca.go
index 5759d51bb0..b72a4c49eb 100644
--- a/agent/consul/leader_connect_ca.go
+++ b/agent/consul/leader_connect_ca.go
@@ -802,7 +802,7 @@ func (c *CAManager) UpdateConfiguration(args *structs.CARequest) (reterr error)
 
 	// Exit early if it's a no-op change
 	state := c.delegate.State()
-	confIdx, config, err := state.CAConfig(nil)
+	_, config, err := state.CAConfig(nil)
 	if err != nil {
 		return err
 	}
@@ -1002,7 +1002,6 @@ func (c *CAManager) UpdateConfiguration(args *structs.CARequest) (reterr error)
 
 	args.Op = structs.CAOpSetRootsAndConfig
 	args.Index = idx
-	args.Config.ModifyIndex = confIdx
 	args.Roots = newRoots
 	resp, err := c.delegate.ApplyCARequest(args)
 	if err != nil {