diff --git a/src/Subscriber/ContextSubscriber.php b/src/Subscriber/ContextSubscriber.php
index fe4077d3..d30c2b4d 100644
--- a/src/Subscriber/ContextSubscriber.php
+++ b/src/Subscriber/ContextSubscriber.php
@@ -73,12 +73,17 @@ public static function getSubscribedEvents()
 
     public function onContextRestored(SalesChannelContextRestoredEvent $event): void
     {
+        if (!method_exists($event, 'getCurrentSalesChannelContext')) {
+            return;
+        }
+
         $token = $event->getRestoredSalesChannelContext()->getToken();
         $oldToken = $event->getCurrentSalesChannelContext()->getToken();
 
+
         $stateData = $this->paymentStateDataService->fetchRedeemedGiftCardsFromContextToken($oldToken);
-        foreach ($stateData->getElements() as $statedataArray) {
-            $this->paymentStateDataService->updateStateDataContextToken($statedataArray, $token);
+        foreach ($stateData->getElements() as $stateDataArray) {
+            $this->paymentStateDataService->updateStateDataContextToken($stateDataArray, $token);
         }
     }