diff --git a/classes/Api/Client/AccountsClient.php b/classes/Api/Client/AccountsClient.php
index 77652c436..19c326ec9 100644
--- a/classes/Api/Client/AccountsClient.php
+++ b/classes/Api/Client/AccountsClient.php
@@ -88,7 +88,7 @@ public function verifyToken($idToken)
         return $this->post([
             'json' => [
                 'headers' => $this->getHeaders([
-                    'X-Shop-Id' => $this->shopProvider->getCurrentShop()['id'],
+                    'X-Shop-Id' => $this->shopProvider->getShopContext()->getConfiguration()->getShopUuid(),
                 ]),
                 'token' => $idToken,
             ],
@@ -107,7 +107,7 @@ public function refreshToken($refreshToken)
         return $this->post([
             'json' => [
                 'headers' => $this->getHeaders([
-                    'X-Shop-Id' => $this->shopProvider->getCurrentShop()['id'],
+                    'X-Shop-Id' => $this->shopProvider->getShopContext()->getConfiguration()->getShopUuid(),
                 ]),
                 'token' => $refreshToken,
             ],