Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 8145)
+++ /lib/wpsg_calculation.class.php	(revision 8146)
@@ -509,4 +509,6 @@
                 	$netto = 0;
 
+					$country_id = $this->getTargetCountry()['id'];
+					
                 	foreach ($cr['set'] as $set) {
 		
@@ -642,7 +644,4 @@
 					$cr['set'] = array_values($cr['set'])[0];
 						
-					//$country_id = preg_replace('/(.*)\_/', '',$cr['tax_key']);
-					$country_id = $this->getTargetCountry()['id'];
-	
 					$netto_calculated_single = $netto;
 					$brutto_calculated_single = $brutto;
@@ -1339,7 +1338,8 @@
 			
 			// "Mwst. gemÀß Lieferland berechnen" beachten
-			if (\wpsg_ShopController::getShop()->get_option('wpsg_deliverycountrytax') === '1' && ($ses['checkout']['shipping_land']??0) != $oDefaultCountry->id) {
+			if (\wpsg_ShopController::getShop()->get_option('wpsg_deliverycountrytax') === '1' && ($ses['checkout']['shipping_land']??0) > 0 && ($ses['checkout']['shipping_land']??0) != $oDefaultCountry->id) {
 			
 				$oShippingCountry = \wpsg_country::getInstance($ses['checkout']['shipping_land']);
+				
 				$this->addCountry($oShippingCountry->id, $oShippingCountry->mwst, $oShippingCountry->mwst_a, $oShippingCountry->mwst_b, $oShippingCountry->mwst_c, $oShippingCountry->mwst_d, false);
 				
@@ -1421,5 +1421,5 @@
 				$this->setTaxMode(self::TAXMODE_SMALLBUSINESS);
 				
-			} else if ($this->getTargetCountry()['tax_mode'] === '2' && wpsg_isSizedString($_SESSION['wpsg']['checkout']['ustidnr'])) {
+			} else if (($this->getTargetCountry()['tax_mode'] === '2' && wpsg_isSizedString($_SESSION['wpsg']['checkout']['ustidnr'])) || $this->getTargetCountry()['tax_mode'] === '1') {
 				
 				$this->setTaxMode(self::TAXMODE_B2B);
@@ -1593,4 +1593,7 @@
 						if ($tax_key !== $tax_key2 && !$noTax) {
 							
+							//if ($this->getTargetCountry()['tax_mode'] == '1') $brutto = $netto;
+							if ($this->tax_mode === self::TAXMODE_B2B) $brutto = $netto;
+							
 							$this->arCalculation['tax'][$tax_key2]['netto'] += $netto;
 							$this->arCalculation['tax'][$tax_key2]['brutto'] += $brutto;
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml	(revision 8145)
+++ /views/warenkorb/basket.phtml	(revision 8146)
@@ -14,5 +14,5 @@
 	if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';
 	else $display_brutto_netto = 'netto';
-	
+	     
 ?>
 <div class="wpsg wpsg_basket <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">