diff --git a/modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php b/modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php
index 8388cb5..ad8a2c3 100644
--- a/modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php
+++ b/modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php
@@ -30,7 +30,11 @@ class marm_diff_oxbasket extends marm_diff_oxbasket_parent
     public function getPriceUntilFreeShipping()
     {
         if ( $this->_oProductsPriceList ) {
+            if ( !$this->isCalculationModeNetto() ){
             $productsPrice = $this->_oProductsPriceList->getBruttoSum();
+            } else {
+            $productsPrice = $this->_oProductsPriceList->getNettoSum();
+            }
             $oDB = oxDb::getDb();
             $sQ = 'select OXPARAM from oxdelivery where OXADDSUM = 0';
             $freeShippingPrice = oxDb::getDb()->GetOne($sQ);
diff --git a/modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl b/modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl
index 24ee2c2..79e3855 100644
--- a/modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl
+++ b/modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl
@@ -1,6 +1,12 @@
 [{$smarty.block.parent}]
+[{if $oxcmp_basket->getPriceUntilFreeShipping() > 0 }]
 <p class="totals">
    Nur noch <strong>[{$oxcmp_basket->getPriceUntilFreeShipping()}]
    [{ $currency->sign}]</strong>
-   und wir schicken Ihnen Ihre Bestellung kostenlos.
-</p>
\ No newline at end of file
+   und wir liefern Ihnen Ihre Bestellung kostenlos.
+</p>
+[{else}]
+<p class="totals">
+    Versandkostenfreie Lieferung!
+</p>
+[{/if}]
\ No newline at end of file