diff --git a/includes/Classifai/Admin/PreviewClassifierData.php b/includes/Classifai/Admin/PreviewClassifierData.php
index cfd8cdd0d..e643f3c0f 100644
--- a/includes/Classifai/Admin/PreviewClassifierData.php
+++ b/includes/Classifai/Admin/PreviewClassifierData.php
@@ -28,17 +28,8 @@ public function get_post_classifier_preview_data() {
 		$classifier = new \Classifai\Watson\Classifier();
 		$normalizer = new \Classifai\Watson\Normalizer();
 
-		$features['categories'] = (object) [];
-		$features['concepts']   = (object) [];
-		$features['entities']   = (object) [];
-		$features['keywords']   = [
-			'emotion'   => false,
-			'sentiment' => false,
-			'limit'     => defined( 'WATSON_KEYWORD_LIMIT' ) ? WATSON_KEYWORD_LIMIT : 10,
-		];
-
 		$text_to_classify        = $normalizer->normalize( $post_id );
-		$body                    = $classifier->get_body( $text_to_classify, $features );
+		$body                    = $classifier->get_body( $text_to_classify );
 		$request_options['body'] = $body;
 		$request                 = $classifier->get_request();
 
diff --git a/includes/Classifai/Watson/Classifier.php b/includes/Classifai/Watson/Classifier.php
index da0d3a527..0301aa304 100644
--- a/includes/Classifai/Watson/Classifier.php
+++ b/includes/Classifai/Watson/Classifier.php
@@ -115,7 +115,7 @@ public function get_body( $text, $options = [] ) {
 				'keywords'   => [
 					'emotion'   => false,
 					'sentiment' => false,
-					'limit'     => 10,
+					'limit'     => defined( 'WATSON_KEYWORD_LIMIT' ) ? WATSON_KEYWORD_LIMIT : 10,
 				],
 				'concepts'   => (object) [],
 				'entities'   => (object) [],