diff --git a/templates/single-product/product-attributes.php b/templates/single-product/product-attributes.php
index bd1a87faaa5..da978fcf25d 100644
--- a/templates/single-product/product-attributes.php
+++ b/templates/single-product/product-attributes.php
@@ -6,48 +6,46 @@
  *
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     2.0.8
+ * @version     2.1.3
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
-global $woocommerce;
-
-$alt = 1;
+$has_row    = false;
+$alt        = 1;
 $attributes = $product->get_attributes();
 
-if ( empty( $attributes ) && ( ! $product->enable_dimensions_display() || ( ! $product->has_dimensions() && ! $product->has_weight() ) ) ) return;
+ob_start();
 ?>
 <table class="shop_attributes">
 
 	<?php if ( $product->enable_dimensions_display() ) : ?>
 
-		<?php if ( $product->has_weight() ) : ?>
-
+		<?php if ( $product->has_weight() ) : $has_row = true; ?>
 			<tr class="<?php if ( ( $alt = $alt * -1 ) == 1 ) echo 'alt'; ?>">
 				<th><?php _e( 'Weight', 'woocommerce' ) ?></th>
 				<td class="product_weight"><?php echo $product->get_weight() . ' ' . esc_attr( get_option( 'woocommerce_weight_unit' ) ); ?></td>
 			</tr>
-
 		<?php endif; ?>
 
-		<?php if ( $product->has_dimensions() ) : ?>
-
+		<?php if ( $product->has_dimensions() ) : $has_row = true; ?>
 			<tr class="<?php if ( ( $alt = $alt * -1 ) == 1 ) echo 'alt'; ?>">
 				<th><?php _e( 'Dimensions', 'woocommerce' ) ?></th>
 				<td class="product_dimensions"><?php echo $product->get_dimensions(); ?></td>
 			</tr>
-
 		<?php endif; ?>
 
 	<?php endif; ?>
 
 	<?php foreach ( $attributes as $attribute ) :
-
-		if ( empty( $attribute['is_visible'] ) || ( $attribute['is_taxonomy'] && ! taxonomy_exists( $attribute['name'] ) ) )
+		if ( empty( $attribute['is_visible'] ) || ( $attribute['is_taxonomy'] && ! taxonomy_exists( $attribute['name'] ) ) ) {
 			continue;
+		} else {
+			$has_row = true;
+		}
 		?>
-
 		<tr class="<?php if ( ( $alt = $alt * -1 ) == 1 ) echo 'alt'; ?>">
 			<th><?php echo wc_attribute_label( $attribute['name'] ); ?></th>
 			<td><?php
@@ -65,7 +63,12 @@ if ( empty( $attributes ) && ( ! $product->enable_dimensions_display() || ( ! $p
 				}
 			?></td>
 		</tr>
-
 	<?php endforeach; ?>
-
-</table>
\ No newline at end of file
+	
+</table>
+<?php
+if ( $has_row ) {
+	echo ob_get_clean();
+} else {
+	ob_end_clean();
+}
\ No newline at end of file