diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
index 2114c6df1..eee1778e5 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
@@ -330,7 +330,7 @@ public final class MethodBody implements Cloneable {
         b.getCode().markMappedOffsets();
 
         if (Configuration.autoDeobfuscate.get()) {
-            if (Configuration.deobfuscationMode.get() == 0) {
+            if (Configuration.deobfuscationOldMode.get()) {
                 try {
                     b.getCode().removeTraps(constants, trait, method_info.get(this.method_info), b, abc, scriptIndex, classIndex, isStatic, path);
                 } catch (Throwable ex) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionListReader.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionListReader.java
index 7f2a6a07a..23e54f0de 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionListReader.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionListReader.java
@@ -92,7 +92,7 @@ public class ActionListReader {
      */
     public static ActionList readActionListTimeout(final List<DisassemblyListener> listeners, final SWFInputStream sis, final int version, final int ip, final int endIp, final String path) throws IOException, InterruptedException, TimeoutException {
         try {
-            final int deobfuscationMode = Configuration.autoDeobfuscate.get() ? Configuration.deobfuscationMode.get() : -1;
+            final int deobfuscationMode = Configuration.autoDeobfuscate.get() ? (Configuration.deobfuscationOldMode.get() ? 0 : 1) : -1;
             ActionList actions = CancellableWorker.call(new Callable<ActionList>() {
 
                 @Override
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index cfe6bf300..a5374b9f7 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -90,9 +90,9 @@ public class Configuration {
     @ConfigurationCategory("script")
     public static final ConfigurationItem<Boolean> autoDeobfuscate = null;
 
-    @ConfigurationDefaultInt(1)
+    @ConfigurationDefaultBoolean(false)
     @ConfigurationCategory("")
-    public static final ConfigurationItem<Integer> deobfuscationMode = null;
+    public static final ConfigurationItem<Boolean> deobfuscationOldMode = null;
 
     @ConfigurationDefaultBoolean(false)
     @ConfigurationCategory("")
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
index 8a941fc13..00edafaaa 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
@@ -362,3 +362,6 @@ config.description.swfSpecificConfigs = Contains the SWF specific configurations
 
 config.name.exeExportMode = EXE export mode
 config.description.exeExportMode = EXE export mode
+
+config.name.deobfuscationOldMode = Switch deobfuscation to old (5.x) mode
+config.description.deobfuscationOldMode = Disable new deobfuscation and use the old one from previous versions. NOT RECOMMENDED.