diff --git a/includes/classes/class-plugin.php b/includes/classes/class-plugin.php
index 0f4cc3b3..6bb0f558 100644
--- a/includes/classes/class-plugin.php
+++ b/includes/classes/class-plugin.php
@@ -31,6 +31,12 @@ public function __construct() {
 		// The REST api must load if admin or not.
 		$rest_api = new REST_Api();
 		$rest_api->init_hooks();
+
+		// When WP CLI is enabled, load the CLI commands.
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+			$cli = new BootstrapCLI();
+			$cli->register();
+		}
 	}
 
 	/**
@@ -53,10 +59,5 @@ private function init() {
 
 		$frontend_validate = new Frontend_Validate();
 		$frontend_validate->init_hooks();
-
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			$cli = new BootstrapCLI();
-			$cli->register();
-		}
 	}
 }