diff --git a/Makefile b/Makefile
index 6ef36bb0d7..7a802b1f32 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ pep8:
 	flake8 src tests tests_common
 
 .PHONY: mypy mypy-diff mypy-save
-RUN_MYPY=MYPYPATH=stubs:src python -m mypy --html-report mypy -p inmanta
+RUN_MYPY=MYPYPATH=stubs:src python -m mypy --soft-error-limit=-1 --html-report mypy -p inmanta
 
 mypy:
 	$(RUN_MYPY)
diff --git a/changelogs/unreleased/mypy-error-limit-fix.yml b/changelogs/unreleased/mypy-error-limit-fix.yml
new file mode 100644
index 0000000000..32c80c1d96
--- /dev/null
+++ b/changelogs/unreleased/mypy-error-limit-fix.yml
@@ -0,0 +1,6 @@
+description: Updated Makefile to disable mypy error limit
+change-type: patch
+destination-branches:
+  - iso4
+  - iso5
+  - master
diff --git a/tox.ini b/tox.ini
index 739bfff27c..e1a7f3b88d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,5 +55,5 @@ commands_pre = mkdir -p coverage
 whitelist_externals = */mkdir
 setenv = MYPYPATH=stubs:src
 commands =
-    python -m mypy --junit-xml mypy.xml --cobertura-xml-report coverage -p inmanta
+    python -m mypy --soft-error-limit=-1 --junit-xml mypy.xml --cobertura-xml-report coverage -p inmanta
 ignore_outcome = true