diff --git a/upgrade-helper.py b/upgrade-helper.py
index 68f315b..67ca54b 100755
--- a/upgrade-helper.py
+++ b/upgrade-helper.py
@@ -184,6 +184,9 @@ class Updater(object):
                     _layer_settings_error(s)
 
             self.git = Git(self.opts['layer_dir'])
+        elif settings.get('layer_dir'):
+            # allow to set the git repo directory without enabling layer_mode
+            self.git = Git(settings.get('layer_dir'))
         else:
             # use scripts_path to get oe-core directory
             self.git = Git(os.path.dirname(scripts_path))