diff --git a/includes/class-wc-shortcodes.php b/includes/class-wc-shortcodes.php
index 378168fc9b5..e95bf1e8176 100644
--- a/includes/class-wc-shortcodes.php
+++ b/includes/class-wc-shortcodes.php
@@ -446,9 +446,9 @@ class WC_Shortcodes {
 			return '';
 		}
 
-		$product = wc_setup_product_data( $product_data );
-
-		if ( ! $product ) {
+		if ( is_object( $product_data ) ) {
+			$product = wc_setup_product_data( $product_data );
+		} else {
 			return '';
 		}
 
@@ -494,6 +494,12 @@ class WC_Shortcodes {
 			return '';
 		}
 
+		if ( is_object( $product_data ) ) {
+			$product = wc_setup_product_data( $product_data );
+		} else {
+			return '';
+		}
+
 		if ( 'product' !== $product_data->post_type ) {
 			return '';
 		}