diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl
index 2b5e0c038..2e323f292 100644
--- a/themes/default/shopping-cart.tpl
+++ b/themes/default/shopping-cart.tpl
@@ -149,16 +149,23 @@
 				</td>
 			</tr>
 			{if $use_taxes}
-				{if $priceDisplay}
-					<tr class="cart_total_delivery" {if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
-						<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if}</td>
-						<td colspan="2" class="price" id="total_shipping">{displayPrice price=$total_shipping_tax_exc}</td>
+				{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
+					<tr class="cart_total_delivery">
+						<td colspan="5">{l s='Shipping:'}</td>
+						<td colspan="2" class="price" id="total_shipping">{l s='Free Shipping!'}</td>
 					</tr>
 				{else}
-					<tr class="cart_total_delivery"{if $total_shipping <= 0} style="display:none;"{/if}>
-						<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax incl.):'}{else}{l s='Total shipping:'}{/if}</td>
-						<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping}</td>
-					</tr>
+					{if $priceDisplay}
+						<tr class="cart_total_delivery" {if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
+							<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if}</td>
+							<td colspan="2" class="price" id="total_shipping">{displayPrice price=$total_shipping_tax_exc}</td>
+						</tr>
+					{else}
+						<tr class="cart_total_delivery"{if $total_shipping <= 0} style="display:none;"{/if}>
+							<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax incl.):'}{else}{l s='Total shipping:'}{/if}</td>
+							<td colspan="2" class="price" id="total_shipping" >{displayPrice price=$total_shipping}</td>
+						</tr>
+					{/if}
 				{/if}
 			{else}
 				<tr class="cart_total_delivery"{if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>