diff --git a/openerp/models.py b/openerp/models.py
index 6beffe5072f..f584c72ada6 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -5667,7 +5667,11 @@ class BaseModel(object):
         while self.env.has_todo():
             field, recs = self.env.get_todo()
             # evaluate the fields to recompute, and save them to database
-            names = [f.name for f in field.computed_fields if f.store]
+            names = [
+                f.name
+                for f in field.computed_fields
+                if f.store and self.env.field_todo(f)
+            ]
             for rec in recs:
                 try:
                     values = rec._convert_to_write({