diff --git a/agent/consul/fsm/commands_oss.go b/agent/consul/fsm/commands_oss.go
index ea6c15fcc6..36a7132f1d 100644
--- a/agent/consul/fsm/commands_oss.go
+++ b/agent/consul/fsm/commands_oss.go
@@ -267,6 +267,9 @@ func (c *FSM) applyACLOperation(buf []byte, index uint64) interface{} {
 		return req.ACL.ID
 	case structs.ACLDelete:
 		return c.state.ACLTokenDeleteBySecret(index, req.ACL.ID, nil)
+	// Legacy commands that have been removed
+	case "bootstrap-now", "force-set":
+		return fmt.Errorf("command %v has been removed with the legacy ACL system", req.Op)
 	default:
 		c.logger.Warn("Invalid ACL operation", "operation", req.Op)
 		return fmt.Errorf("Invalid ACL operation '%s'", req.Op)