diff --git a/modules/ppcp-api-client/src/Endpoint/RequestTrait.php b/modules/ppcp-api-client/src/Endpoint/RequestTrait.php
index f9db8101e..369dc9c1e 100644
--- a/modules/ppcp-api-client/src/Endpoint/RequestTrait.php
+++ b/modules/ppcp-api-client/src/Endpoint/RequestTrait.php
@@ -90,6 +90,7 @@ trait RequestTrait {
 			if (
 				isset( $response['body'] )
 				&& isset( $response['response']['code'] )
+				&& ! in_array( $response['response']['code'], array( 200, 201, 202, 204 ), true )
 			) {
 				$output .= 'Response Body: ' . wc_print_r( $response['body'], true ) . "\n";
 			}
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 433e97931..63a5a4814 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -2218,7 +2218,15 @@ return array(
 		);
 	},
 	'wcgateway.logging.is-enabled'                      => function ( ContainerInterface $container ) : bool {
-		return true;
+		$settings = $container->get( 'wcgateway.settings' );
+
+		/**
+		 * Whether the logging of the plugin errors/events is enabled.
+		 */
+		return apply_filters(
+			'woocommerce_paypal_payments_is_logging_enabled',
+			$settings->has( 'logging_enabled' ) && $settings->get( 'logging_enabled' )
+		);
 	},
 
 	'wcgateway.helper.vaulting-scope'                   => static function ( ContainerInterface $container ): bool {