diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php
index ef09dc51..66c312eb 100644
--- a/Controller/Checkout/Exchange.php
+++ b/Controller/Checkout/Exchange.php
@@ -343,6 +343,8 @@ private function processPaidOrder(Transaction $transaction, Order $order)
                 $order->setTotalPaid($order->getGrandTotal());
                 $order->setBaseTotalPaid($order->getBaseGrandTotal());
 
+                $newStatus = ($transaction->isAuthorized()) ? $this->config->getAuthorizedStatus($paymentMethod) : $this->config->getPaidStatus($paymentMethod);
+                $order->setStatus(!empty($newStatus) ? $newStatus : Order::STATE_PROCESSING);
                 $order->addStatusHistoryComment(__('B2B Setting: Skipped creating invoice'));
                 $this->orderRepository->save($order);
                 return $this->result->setContents("TRUE| " . $message . " (B2B: No invoice created)");
@@ -356,13 +358,8 @@ private function processPaidOrder(Transaction $transaction, Order $order)
             $payment->registerCaptureNotification($paidAmount, $this->config->isSkipFraudDetection());
         }
 
-        if ($transaction->isAuthorized()) {
-            $statusAuthorized = $this->config->getAuthorizedStatus($paymentMethod);
-            $order->setStatus(!empty($statusAuthorized) ? $statusAuthorized : Order::STATE_PROCESSING);
-        } else {
-            $statusPaid = $this->config->getPaidStatus($paymentMethod);
-            $order->setStatus(!empty($statusPaid) ? $statusPaid : Order::STATE_PROCESSING);
-        }
+        $newStatus = ($transaction->isAuthorized()) ? $this->config->getAuthorizedStatus($paymentMethod) : $this->config->getPaidStatus($paymentMethod);
+        $order->setStatus(!empty($newStatus) ? $newStatus : Order::STATE_PROCESSING);
 
         $this->orderRepository->save($order);