diff --git a/odoo/modules/loading.py b/odoo/modules/loading.py
index 751d27ffa5de..b1fab8a65a09 100644
--- a/odoo/modules/loading.py
+++ b/odoo/modules/loading.py
@@ -303,6 +303,10 @@ def load_test(idref, mode):
             ver = adapt_version(package.data['version'])
             # Set new modules and dependencies
             module.write({'state': 'installed', 'latest_version': ver})
+            # OpenUpgrade: commit module_n state and version immediatly
+            # to avoid invalid database state if module_n+1 raises an
+            # exception
+            cr.commit_org()
 
             package.load_state = package.state
             package.load_version = package.installed_version