diff --git a/source/Internal/Transition/Utility/BasicContextInterface.php b/source/Internal/Transition/Utility/BasicContextInterface.php
index a3691350f69..4a554935ef6 100644
--- a/source/Internal/Transition/Utility/BasicContextInterface.php
+++ b/source/Internal/Transition/Utility/BasicContextInterface.php
@@ -69,7 +69,7 @@ public function getOutPath(): string;
     public function getDefaultShopId(): int;
 
     /**
-     * @return int
+     * @deprecated on v7.0.4, Please use the ContextInterface instead of current one
      */
     public function getCurrentShopId(): int;
 
diff --git a/source/Internal/Transition/Utility/ContextInterface.php b/source/Internal/Transition/Utility/ContextInterface.php
index 38c1fc8ed99..0c4609981ca 100644
--- a/source/Internal/Transition/Utility/ContextInterface.php
+++ b/source/Internal/Transition/Utility/ContextInterface.php
@@ -13,6 +13,8 @@
 
 interface ContextInterface extends BasicContextInterface
 {
+    public function getCurrentShopId(): int;
+
     /**
      * @return string
      */
diff --git a/source/Internal/Transition/Utility/services.yaml b/source/Internal/Transition/Utility/services.yaml
index d8400f55f01..f3c22b078ea 100644
--- a/source/Internal/Transition/Utility/services.yaml
+++ b/source/Internal/Transition/Utility/services.yaml
@@ -5,3 +5,7 @@ services:
   OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface:
     class: OxidEsales\EshopCommunity\Internal\Transition\Utility\Context
     public: true
+
+  OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface:
+    class: OxidEsales\EshopCommunity\Internal\Transition\Utility\Context
+    public: true
\ No newline at end of file