Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 8112)
+++ /controller/wpsg_ShopController.class.php	(revision 8117)
@@ -2062,19 +2062,15 @@
 			
 			// GÃŒltigkeit checken
-			if (($_SESSION['wpsg']['checkout']['payment']??'') !== '') { 
-									
-				if (!array_key_exists($_SESSION['wpsg']['checkout']['payment'], $this->arPayment) && sizeof($this->arPayment) > 0) {
+			if (!array_key_exists($_SESSION['wpsg']['checkout']['payment'], $this->arPayment) && sizeof($this->arPayment) > 0) {
 					
-					$_SESSION['wpsg']['checkout']['payment'] = array_keys($this->arPayment)[0];
-					$this->basket->arCheckout['payment'] = array_keys($this->arPayment)[0];
-					
-					$oCalculation->update();
-											
-				}
+				$_SESSION['wpsg']['checkout']['payment'] = array_keys($this->arPayment)[0];
+				$this->basket->arCheckout['payment'] = array_keys($this->arPayment)[0];
 				
-				$this->view['basket']['checkout']['payment'] = $_SESSION['wpsg']['checkout']['payment'];
-				
-			}
-
+				$oCalculation->update();
+										
+			}
+			
+			$this->view['basket']['checkout']['payment'] = $_SESSION['wpsg']['checkout']['payment'];
+			
 			if (!wpsg_isSizedString($_SESSION['wpsg']['checkout']['title']) && wpsg_isSizedString($this->get_option('wpsg_customerpreset_title'))) {
 
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml	(revision 8112)
+++ /views/warenkorb/basket.phtml	(revision 8117)
@@ -238,5 +238,5 @@
 						<?php } ?>
 					</select>
-					<?php } else if (!wpsg_isSizedArray($this->arShipping) || !array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping)) { ?>
+					<?php } else if (!wpsg_isSizedArray($this->arShipping)) { ?>
 					<span><?php echo __('Keine Versandart möglich / Bitte manuell anfragen', 'wpsg'); ?></span>
 					<?php } else { ?>