diff --git a/rhodecode/lib/dbmigrate/versions/116_version_5_7_0.py b/rhodecode/lib/dbmigrate/versions/116_version_5_7_0.py
index 524ff816..bd0389b3 100644
--- a/rhodecode/lib/dbmigrate/versions/116_version_5_7_0.py
+++ b/rhodecode/lib/dbmigrate/versions/116_version_5_7_0.py
@@ -44,6 +44,12 @@ def downgrade(migrate_engine):
     pass
 
 
+def _get_global_setting(repo):
+    key = "%s_close_branch_before_merging" % repo.repo_type
+    setting = next(filter(lambda s: s.app_settings_name == key, repo.settings))
+    return setting.app_settings_value
+
+
 def _inherit_settings(models, _SESSION, op):
     _models = [models.PullRequest, models.PullRequestVersion]
     _seen_repos = {}
@@ -55,10 +61,7 @@ def _inherit_settings(models, _SESSION, op):
             close_branch_before_merging = False
 
             if repo_type in ["git", "hg"]:
-                key = "%s_close_branch_before_merging" % repo_type
-
-                setting = next(filter(lambda s: s.app_settings_name == key, repo.settings))
-                close_branch_before_merging = _seen_repos.get(repo.repo_id, setting.app_settings_value)
+                close_branch_before_merging = _seen_repos.get(repo.repo_id, _get_global_setting(repo))
                 _seen_repos[repo.repo_id] = close_branch_before_merging
 
             json_settings = {"close_branch_before_merging": close_branch_before_merging}