diff --git a/src/libs/clangsupport/clangcodemodelconnectionclient.cpp b/src/libs/clangsupport/clangcodemodelconnectionclient.cpp
index 33d89870249..56186e24dc6 100644
--- a/src/libs/clangsupport/clangcodemodelconnectionclient.cpp
+++ b/src/libs/clangsupport/clangcodemodelconnectionclient.cpp
@@ -53,6 +53,7 @@ ClangCodeModelConnectionClient::ClangCodeModelConnectionClient(
 
     Utils::Environment environment;
     environment.set(QStringLiteral("LIBCLANG_NOTHREADS"), QString());
+    environment.set(QStringLiteral("LIBCLANG_DISABLE_CRASH_RECOVERY"), QString());
     m_processCreator.setEnvironment(environment);
 
     stdErrPrefixer().setPrefix("clangbackend.stderr: ");
diff --git a/src/tools/clangbackend/clangbackendmain.cpp b/src/tools/clangbackend/clangbackendmain.cpp
index 28b7f251b6d..338fec79822 100644
--- a/src/tools/clangbackend/clangbackendmain.cpp
+++ b/src/tools/clangbackend/clangbackendmain.cpp
@@ -82,7 +82,6 @@ int main(int argc, char *argv[])
 
     const QString connection = processArguments(application);
 
-    clang_toggleCrashRecovery(true);
     clang_enableStackTraces();
 
     ClangCodeModelServer clangCodeModelServer;