diff --git a/modules/account/journal.py b/modules/account/journal.py
index 09e400e5cd..6fe8119e1b 100644
--- a/modules/account/journal.py
+++ b/modules/account/journal.py
@@ -90,7 +90,7 @@ class Journal(
         pool = Pool()
         Company = pool.get('company.company')
         company_id = Transaction().context.get('company')
-        if company_id:
+        if company_id is not None and company_id >= 0:
             company = Company(company_id)
             digits = company.currency.digits
         else:
diff --git a/modules/account/tax.py b/modules/account/tax.py
index e0f1e72843..9aeb028374 100644
--- a/modules/account/tax.py
+++ b/modules/account/tax.py
@@ -1844,7 +1844,7 @@ class TestTaxView(ModelView, TaxableMixin):
         pool = Pool()
         Company = pool.get('company.company')
         company_id = Transaction().context.get('company')
-        if company_id:
+        if company_id is not None and company_id >= 0:
             company = Company(company_id)
             return company.currency.id
 
diff --git a/modules/account_credit_limit/account.py b/modules/account_credit_limit/account.py
index 6a8505bc60..63a3c1a921 100644
--- a/modules/account_credit_limit/account.py
+++ b/modules/account_credit_limit/account.py
@@ -26,7 +26,7 @@ class Configuration(metaclass=PoolMeta):
         pool = Pool()
         Company = pool.get('company.company')
         company_id = Transaction().context.get('company')
-        if company_id:
+        if company_id is not None and company_id >= 0:
             company = Company(company_id)
             return company.currency.digits
 
diff --git a/modules/account_invoice/payment_term.py b/modules/account_invoice/payment_term.py
index 121041307e..d8dd7165d5 100644
--- a/modules/account_invoice/payment_term.py
+++ b/modules/account_invoice/payment_term.py
@@ -379,7 +379,7 @@ class TestPaymentTermView(ModelView):
         pool = Pool()
         Company = pool.get('company.company')
         company = Transaction().context.get('company')
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @fields.depends('currency')
diff --git a/modules/account_payment_sepa/payment.py b/modules/account_payment_sepa/payment.py
index 55bb0fcd93..5819376c69 100644
--- a/modules/account_payment_sepa/payment.py
+++ b/modules/account_payment_sepa/payment.py
@@ -157,7 +157,7 @@ class Journal(metaclass=PoolMeta):
         pool = Pool()
         Company = pool.get('company.company')
         company_id = cls.default_company()
-        if company_id:
+        if company_id is not None and company_id >= 0:
             return Company(company_id).party.id
 
     @fields.depends('company')
diff --git a/modules/commission/commission.py b/modules/commission/commission.py
index 7039f6128b..c881fd67cd 100644
--- a/modules/commission/commission.py
+++ b/modules/commission/commission.py
@@ -84,7 +84,7 @@ class Agent(ModelSQL, ModelView):
         pool = Pool()
         Company = pool.get('company.company')
         company = cls.default_company()
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @fields.depends('company', 'currency')
diff --git a/modules/product_cost_warehouse/product.py b/modules/product_cost_warehouse/product.py
index 8010c53f2e..9d120dd976 100644
--- a/modules/product_cost_warehouse/product.py
+++ b/modules/product_cost_warehouse/product.py
@@ -201,7 +201,7 @@ class CostPriceRevision(metaclass=PoolMeta):
         pool = Pool()
         Company = pool.get('company.company')
         company_id = cls.default_company()
-        if company_id:
+        if company_id is not None and company_id >= 0:
             company = Company(company_id)
             if company.cost_price_warehouse:
                 return Transaction().context.get('warehouse')
diff --git a/modules/purchase/purchase.py b/modules/purchase/purchase.py
index 81f09b9bee..3a42cbed94 100644
--- a/modules/purchase/purchase.py
+++ b/modules/purchase/purchase.py
@@ -396,7 +396,7 @@ class Purchase(
     def default_currency():
         Company = Pool().get('company.company')
         company = Transaction().context.get('company')
-        if company:
+        if company is not None and company >= 0:
             company = Company(company)
             return company.currency.id
 
diff --git a/modules/purchase_requisition/purchase.py b/modules/purchase_requisition/purchase.py
index f2aed9fda9..3e56ae4aa7 100644
--- a/modules/purchase_requisition/purchase.py
+++ b/modules/purchase_requisition/purchase.py
@@ -245,7 +245,7 @@ class PurchaseRequisition(Workflow, ModelSQL, ModelView):
     def default_currency(cls):
         Company = Pool().get('company.company')
         company = Transaction().context.get('company')
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @classmethod
diff --git a/modules/sale/product.py b/modules/sale/product.py
index e6f2ffd71c..3666163b0e 100644
--- a/modules/sale/product.py
+++ b/modules/sale/product.py
@@ -227,7 +227,7 @@ class SaleContext(ModelView):
         pool = Pool()
         Company = pool.get('company.company')
         company_id = cls.default_company()
-        if company_id:
+        if company_id is not None and company_id >= 0:
             company = Company(company_id)
             return company.currency.id
 
diff --git a/modules/sale/sale.py b/modules/sale/sale.py
index 21d3fa01ea..1c34531c3f 100644
--- a/modules/sale/sale.py
+++ b/modules/sale/sale.py
@@ -410,7 +410,7 @@ class Sale(
     def default_currency():
         Company = Pool().get('company.company')
         company = Transaction().context.get('company')
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @staticmethod
diff --git a/modules/sale/sale_reporting.py b/modules/sale/sale_reporting.py
index a8c9f7b9da..3469c69195 100644
--- a/modules/sale/sale_reporting.py
+++ b/modules/sale/sale_reporting.py
@@ -573,7 +573,7 @@ class CategoryTree(ModelSQL, ModelView):
         pool = Pool()
         Company = pool.get('company.company')
         company = Transaction().context.get('company')
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.digits
 
 
diff --git a/modules/sale_subscription/subscription.py b/modules/sale_subscription/subscription.py
index 415f65c507..8756f3f012 100644
--- a/modules/sale_subscription/subscription.py
+++ b/modules/sale_subscription/subscription.py
@@ -228,7 +228,7 @@ class Subscription(Workflow, ModelSQL, ModelView):
         pool = Pool()
         Company = pool.get('company.company')
         company = cls.default_company()
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.id
 
     @classmethod
diff --git a/modules/stock/stock_reporting_margin.py b/modules/stock/stock_reporting_margin.py
index 557d9fd58f..3cf6414e2b 100644
--- a/modules/stock/stock_reporting_margin.py
+++ b/modules/stock/stock_reporting_margin.py
@@ -623,7 +623,7 @@ class CategoryTree(ModelSQL, ModelView):
         pool = Pool()
         Company = pool.get('company.company')
         company = Transaction().context.get('company')
-        if company:
+        if company is not None and company >= 0:
             return Company(company).currency.digits
 
     @classmethod
diff --git a/modules/web_shop/web.py b/modules/web_shop/web.py
index 8d99f7da90..81b3ec56f8 100644
--- a/modules/web_shop/web.py
+++ b/modules/web_shop/web.py
@@ -131,7 +131,7 @@ class Shop(DeactivableMixin, ModelSQL, ModelView):
         pool = Pool()
         Company = pool.get('company.company')
         company_id = cls.default_company()
-        if company_id:
+        if company_id is not None and company_id >= 0:
             company = Company(company_id)
             return company.currency.id