diff --git a/platform/core-impl/src/com/intellij/diagnostic/EventsWatcher.java b/platform/core-impl/src/com/intellij/diagnostic/EventsWatcher.java
index 1465b26df6b4..54526c6856ee 100644
--- a/platform/core-impl/src/com/intellij/diagnostic/EventsWatcher.java
+++ b/platform/core-impl/src/com/intellij/diagnostic/EventsWatcher.java
@@ -47,7 +47,7 @@ public final class EventsWatcher implements Disposable {
   private static final long ourStartTimestamp = System.currentTimeMillis();
   @NotNull
   private static final NotNullLazyValue<Boolean> ourIsEnabled =
-    NotNullLazyValue.createValue(() -> Registry.is("ide.event.queue.dispatch.enabled", false));
+    NotNullLazyValue.createValue(() -> Registry.is("ide.event.queue.dispatch.log.enabled", false));
   @NotNull
   private static final NotNullLazyValue<Field> ourRunnableField =
     NotNullLazyValue.createValue(() -> Objects.requireNonNull(findTargetField(InvocationEvent.class)));
@@ -159,9 +159,9 @@ public final class EventsWatcher implements Disposable {
 
   public void edtEventStarted(@NotNull AWTEvent event) {
     Matcher matcher = DESCRIPTION_BY_EVENT.matcher(event.toString());
-    //noinspection ResultOfMethodCallIgnored
-    matcher.find();
-    myCurrentResult = matcher.toMatchResult();
+    myCurrentResult = matcher.find() ?
+                      matcher.toMatchResult() :
+                      null;
   }
 
   public void edtEventFinished(@NotNull AWTEvent event,
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 098c2e9b40ef..66863af3564c 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -971,7 +971,7 @@ inplace.rename.segments.limit=200
 emmet.segments.limit=50
 command.line.execution.timeout=30
 
-ide.event.queue.dispatch.log.enabled=true
+ide.event.queue.dispatch.log.enabled=false
 ide.event.queue.dispatch.log.enabled.description=Log EDT events
 ide.event.queue.dispatch.log.enabled.restartRequired=true
 ide.event.queue.dispatch.threshold=10