diff --git a/modules/cart/commerce_cart.module b/modules/cart/commerce_cart.module
index ea3121b..3488f49 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)) {
@@ -670,6 +668,10 @@ function commerce_cart_block_view($delta) {
         $content = theme('commerce_cart_block', $variables);
       }
     }
+    else {
+      // 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..a17a458 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);
@@ -48,6 +45,10 @@ function commerce_cart_view() {
       $content = commerce_embed_view('commerce_cart_form', 'default', array($order->order_id), 'cart');
     }
   }
+  else {
+    // Default to displaying an empty message.
+    $content = theme('commerce_cart_empty_page');
+  }
 
   return $content;
 }