diff --git a/modules/cart/commerce_cart.module b/modules/cart/commerce_cart.module
index ea3121b..91e50cc 100644
--- a/modules/cart/commerce_cart.module
+++ b/modules/cart/commerce_cart.module
@@ -651,8 +651,6 @@ function commerce_cart_block_view($delta) {
 
   // Prepare the display of the default Shopping Cart block.
   if ($delta == 'cart') {
-    // Default to an empty cart block message.
-    $content = theme('commerce_cart_empty_block');
 
     // First check to ensure there are products in the shopping cart.
     if ($order = commerce_cart_order_load($user->uid)) {
@@ -671,6 +669,11 @@ function commerce_cart_block_view($delta) {
       }
     }
 
+    if (empty($content)) {
+      // Default to an empty cart block message.
+      $content = theme('commerce_cart_empty_block');
+    }
+
     return array('subject' => t('Shopping cart'), 'content' => $content);
   }
 }
diff --git a/modules/cart/includes/commerce_cart.pages.inc b/modules/cart/includes/commerce_cart.pages.inc
index 207f6bd..5466bae 100644
--- a/modules/cart/includes/commerce_cart.pages.inc
+++ b/modules/cart/includes/commerce_cart.pages.inc
@@ -34,9 +34,6 @@ function commerce_cart_checkout_router() {
 function commerce_cart_view() {
   global $user;
 
-  // Default to displaying an empty message.
-  $content = theme('commerce_cart_empty_page');
-
   // First check to make sure we have a valid order.
   if ($order = commerce_cart_order_load($user->uid)) {
     $wrapper = entity_metadata_wrapper('commerce_order', $order);
@@ -49,5 +46,10 @@ function commerce_cart_view() {
     }
   }
 
+  if (empty($content)) {
+    // Default to displaying an empty message.
+    $content = theme('commerce_cart_empty_page');
+  }
+
   return $content;
 }