diff --git a/classes/cli/PodsAPI_CLI_Command.php b/classes/cli/PodsAPI_CLI_Command.php
index d9060455ff..0e33700227 100644
--- a/classes/cli/PodsAPI_CLI_Command.php
+++ b/classes/cli/PodsAPI_CLI_Command.php
@@ -504,4 +504,8 @@ public function import_pod( $args, $assoc_args ) {
 
 }
 
-WP_CLI::add_command( 'pods-legacy-api', 'PodsAPI_CLI_Command' );
+if ( defined( 'WP_CLI' ) && WP_CLI ) {
+	WP_CLI::add_hook( 'after_wp_load', function() {
+		WP_CLI::add_command( 'pods-legacy-api', 'PodsAPI_CLI_Command' );
+	} );
+}
diff --git a/classes/cli/Pods_CLI_Command.php b/classes/cli/Pods_CLI_Command.php
index ee8addbd3f..725a47f9bf 100644
--- a/classes/cli/Pods_CLI_Command.php
+++ b/classes/cli/Pods_CLI_Command.php
@@ -385,4 +385,8 @@ public function export( $args, $assoc_args ) {
 
 }
 
-WP_CLI::add_command( 'pods-legacy', 'Pods_CLI_Command' );
+if ( defined( 'WP_CLI' ) && WP_CLI ) {
+	WP_CLI::add_hook( 'after_wp_load', function() {
+		WP_CLI::add_command( 'pods-legacy', 'Pods_CLI_Command' );
+	} );
+}