diff --git a/invoice.py b/invoice.py
index eb9ec45d37..db850eebe5 100644
--- a/invoice.py
+++ b/invoice.py
@@ -258,7 +258,7 @@ class Invoice(OSV):
         required=True, states=_STATES, domain="[('party', '=', party)]")
     currency = fields.Many2One('currency.currency', 'Currency', required=True,
         states={
-            'readonly': "state != 'draft' or bool(lines)",
+            'readonly': "state != 'draft' or (bool(lines) and bool(currency))",
         })
     currency_digits = fields.Function('get_currency_digits', type='integer',
             string='Currency Digits', on_change_with=['currency'])