diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
index 85067752fc01..edb693357da6 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
@@ -47,7 +47,6 @@ import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMExternalizerUtil;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.psi.*;
 import com.intellij.util.StringBuilderSpinAllocator;
 import com.intellij.util.containers.ContainerUtil;
@@ -496,7 +495,7 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
   }
 
   public boolean isEmulated() {
-    return getProperties().EMULATED && Registry.is("debugger.emulate.method.breakpoints");
+    return getProperties().EMULATED;
   }
 
   private boolean isWatchEntry() {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java
index eac2694d42eb..33eede349351 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java
@@ -17,7 +17,6 @@
 package com.intellij.debugger.ui.breakpoints;
 
 import com.intellij.debugger.DebuggerBundle;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.util.ui.DialogUtil;
 import com.intellij.util.ui.JBUI;
@@ -98,8 +97,7 @@ public class MethodBreakpointPropertiesPanel extends XBreakpointCustomProperties
 
   @Override
   public void loadFrom(@NotNull XBreakpoint<JavaMethodBreakpointProperties> breakpoint) {
-    myEmulatedCheckBox.setVisible(
-      Registry.is("debugger.emulate.method.breakpoints") && breakpoint.getType() instanceof JavaMethodBreakpointType);
+    myEmulatedCheckBox.setVisible(breakpoint.getType() instanceof JavaMethodBreakpointType);
     myEmulatedCheckBox.setSelected(breakpoint.getProperties().EMULATED);
 
     myWatchEntryCheckBox.setSelected(breakpoint.getProperties().WATCH_ENTRY);
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index e18b56e2c4a9..85b136989656 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -242,7 +242,7 @@ debugger.renderers.file.description=Enable file object renderer
 debugger.single.smart.step.force=true
 debugger.single.smart.step.force.description=Do force step into on single variant smart step into
 debugger.emulate.method.breakpoints=false
-debugger.emulate.method.breakpoints.description=Emulate method breakpoints with line breakpoints
+debugger.emulate.method.breakpoints.description=Emulate method breakpoints with line breakpoints by default
 debugger.intern.string.literals=false
 debugger.intern.string.literals.description=Make string literal refer to the same instance of class String