diff --git a/modules/default/updatenotification/node_helper.js b/modules/default/updatenotification/node_helper.js
index fad519a5..fa355233 100644
--- a/modules/default/updatenotification/node_helper.js
+++ b/modules/default/updatenotification/node_helper.js
@@ -18,7 +18,7 @@ module.exports = NodeHelper.create({
 		// Push MagicMirror itself , biggest chance it'll show up last in UI and isn't overwritten
 		// others will be added in front
 		// this method returns promises so we can't wait for every one to resolve before continuing
-		simpleGits.push({ module: "default", git: SimpleGit(path.normalize(__dirname + "/../../../")) });
+		simpleGits.push({ module: "default", git: this.createGit(path.normalize(__dirname + "/../../../")) });
 
 		for (let moduleName in modules) {
 			if (!this.ignoreUpdateChecking(moduleName)) {
@@ -55,7 +55,7 @@ module.exports = NodeHelper.create({
 	},
 
 	resolveRemote: async function (moduleFolder) {
-		let git = SimpleGit(moduleFolder);
+		let git = this.createGit(moduleFolder);
 		let remotes = await git.getRemotes(true);
 
 		if (remotes.length < 1 || remotes[0].name.length < 1) {
@@ -81,7 +81,7 @@ module.exports = NodeHelper.create({
 					});
 				}
 			} catch (err) {
-				Log.error("Failed to fetch data for git: " + err);
+				Log.error("Failed to fetch git data for " + sg.module + ": " + err);
 			}
 		}
 
@@ -100,6 +100,10 @@ module.exports = NodeHelper.create({
 		}, delay);
 	},
 
+	createGit: function (folder) {
+		return SimpleGit({ baseDir: folder, timeout: { block: this.config.timeout } });
+	},
+
 	ignoreUpdateChecking: function (moduleName) {
 		// Should not check for updates for default modules
 		if (defaultModules.indexOf(moduleName) >= 0) {
diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js
index 3de82f1c..c67205a7 100644
--- a/modules/default/updatenotification/updatenotification.js
+++ b/modules/default/updatenotification/updatenotification.js
@@ -8,7 +8,8 @@ Module.register("updatenotification", {
 	defaults: {
 		updateInterval: 10 * 60 * 1000, // every 10 minutes
 		refreshInterval: 24 * 60 * 60 * 1000, // one day
-		ignoreModules: []
+		ignoreModules: [],
+		timeout: 1000
 	},
 
 	suspended: false,
diff --git a/package-lock.json b/package-lock.json
index 332efb50..9163508f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6155,9 +6155,9 @@
 			"dev": true
 		},
 		"simple-git": {
-			"version": "2.35.2",
-			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.35.2.tgz",
-			"integrity": "sha512-UjOKsrz92Bx7z00Wla5V6qLSf5X2XSp0sL2gzKw1Bh7iJfDPDaU7gK5avIup0yo1/sMOSUMQer2b9GcnF6nmTQ==",
+			"version": "2.36.2",
+			"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.36.2.tgz",
+			"integrity": "sha512-orBEf65GfSiQMsYedbJXSiRNnIRvhbeE5rrxZuEimCpWxDZOav0KLy2IEiPi1YJCF+zaC2quiJF8A4TsxI9/tw==",
 			"requires": {
 				"@kwsites/file-exists": "^1.1.1",
 				"@kwsites/promise-deferred": "^1.1.1",
diff --git a/package.json b/package.json
index 3dde5e4a..4a854b8b 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
 		"request": "^2.88.2",
 		"rrule": "^2.6.8",
 		"rrule-alt": "^2.2.8",
-		"simple-git": "^2.35.2",
+		"simple-git": "^2.36.2",
 		"socket.io": "^3.1.2",
 		"valid-url": "^1.0.9"
 	},