diff --git a/platform/core-impl/resources/META-INF/core-impl.xml b/platform/core-impl/resources/META-INF/core-impl.xml
index 042886c83bd5..d1a3f16bac46 100644
--- a/platform/core-impl/resources/META-INF/core-impl.xml
+++ b/platform/core-impl/resources/META-INF/core-impl.xml
@@ -18,7 +18,7 @@
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.intellij.diagnostic.PluginProblemReporter"
                         serviceImplementation="com.intellij.diagnostic.PluginProblemReporterImpl"/>
-    <applicationService serviceImplementation="com.intellij.diagnostic.PerformanceWatcher" preload="true"/>
+    <applicationService serviceImplementation="com.intellij.diagnostic.PerformanceWatcher" preload="notHeadless"/>
     <applicationService serviceInterface="com.intellij.openapi.application.ApplicationInfo"
                         serviceImplementation="com.intellij.openapi.application.impl.ApplicationInfoImpl"/>