diff --git a/platform/platform-impl/src/com/intellij/reporting/FreezeLoggerImpl.java b/platform/platform-impl/src/com/intellij/reporting/FreezeLoggerImpl.java
index 901f8e78ee27..079b5317dd64 100644
--- a/platform/platform-impl/src/com/intellij/reporting/FreezeLoggerImpl.java
+++ b/platform/platform-impl/src/com/intellij/reporting/FreezeLoggerImpl.java
@@ -27,6 +27,7 @@ import com.intellij.util.Alarm;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 
 public class FreezeLoggerImpl extends FreezeLogger {
@@ -37,7 +38,7 @@ public class FreezeLoggerImpl extends FreezeLogger {
   
   @Override
   public void runUnderPerformanceMonitor(@Nullable Project project, @NotNull Runnable action) {
-    if (ApplicationManager.getApplication().isUnitTestMode()) {
+    if (isUnderDebug() || ApplicationManager.getApplication().isUnitTestMode()) {
       action.run();
       return;
     }
@@ -83,6 +84,10 @@ public class FreezeLoggerImpl extends FreezeLogger {
     }
   }
   
+  private static boolean isUnderDebug() {
+    return ManagementFactory.getRuntimeMXBean().getInputArguments().toString().contains("jdwp");
+  }
+  
 }
 
 class ThreadDumpInfo {