diff --git a/.husky/pre-commit b/.husky/pre-commit
index 3199e8e0..7ee201c6 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,7 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 
-npm run lint:staged
+[ -f "$(dirname "$0")/_/husky.sh" ] && . "$(dirname "$0")/_/husky.sh"
+
+if command -v npm &> /dev/null; then
+  npm run lint:staged
+fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d7b3dcc..c631831c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ _This release is scheduled to be released on 2022-04-01._
 ### Fixed
 
 - improved and speedup e2e tests, artificial wait after mm start removed.
+- improved husky setup not blocking `git commit` if `husky` or `npm` is not installed.
 
 ## [2.18.0] - 2022-01-01