diff --git a/vault/logical_system_helpers.go b/vault/logical_system_helpers.go
index 8ee1fea79d48..d2e27eba7e6e 100644
--- a/vault/logical_system_helpers.go
+++ b/vault/logical_system_helpers.go
@@ -92,10 +92,6 @@ var (
 	}
 
 	checkRaw = func(b *SystemBackend, path string) error { return nil }
-
-	wrapHandleRaftRemovePeer = func(b *SystemBackend) framework.OperationFunc {
-		return b.handleRaftRemovePeerUpdate()
-	}
 )
 
 // tuneMount is used to set config on a mount point
diff --git a/vault/logical_system_raft.go b/vault/logical_system_raft.go
index 72f468c6d002..ee6ecb3d2239 100644
--- a/vault/logical_system_raft.go
+++ b/vault/logical_system_raft.go
@@ -82,7 +82,7 @@ func (b *SystemBackend) raftStoragePaths() []*framework.Path {
 
 			Operations: map[logical.Operation]framework.OperationHandler{
 				logical.UpdateOperation: &framework.PathOperation{
-					Callback: wrapHandleRaftRemovePeer(b),
+					Callback: b.verifyDROperationToken(b.handleRaftRemovePeerUpdate(), false),
 					Summary:  "Remove a peer from the raft cluster.",
 				},
 			},