diff --git a/src/QUI/ERP/Currency/Handler.php b/src/QUI/ERP/Currency/Handler.php index ae2d5ed843b529de087ab2926645fde58e8117e4..e9fa7a35a61468f9ea7042c4af1969dbc3cf11be 100644 --- a/src/QUI/ERP/Currency/Handler.php +++ b/src/QUI/ERP/Currency/Handler.php @@ -603,8 +603,12 @@ public static function getRuntimeCurrency(): Currency } if (QUI::isFrontend()) { - self::$RuntimeCurrency = self::getUserCurrency(QUI::getUserBySession()); - return self::$RuntimeCurrency; + $Currency = self::getUserCurrency(QUI::getUserBySession()); + + if ($Currency) { + self::$RuntimeCurrency = $Currency; + return self::$RuntimeCurrency; + } } return self::getDefaultCurrency();