diff --git a/Dalamud/Configuration/DalamudConfiguration.cs b/Dalamud/Configuration/DalamudConfiguration.cs
index cb2ffa1ce..aec7cfe16 100644
--- a/Dalamud/Configuration/DalamudConfiguration.cs
+++ b/Dalamud/Configuration/DalamudConfiguration.cs
@@ -138,6 +138,11 @@ namespace Dalamud.Configuration
         /// </summary>
         public bool IsGamepadNavigationEnabled { get; set; } = true;
 
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the anti-anti-debug check is enabled on startup.
+        /// </summary>
+        public bool IsAntiAntiDebugEnabled { get; set; } = false;
+
         /// <summary>
         /// Load a configuration from the provided path.
         /// </summary>
diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index 7c98e6a8e..3b0638053 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -229,8 +229,11 @@ namespace Dalamud
                 this.Configuration = DalamudConfiguration.Load(this.StartInfo.ConfigurationPath);
 
                 this.AntiDebug = new AntiDebug(this.SigScanner);
+                if (this.Configuration.IsAntiAntiDebugEnabled)
+                    this.AntiDebug.Enable();
 #if DEBUG
-                this.AntiDebug.Enable();
+                if (!this.AntiDebug.IsEnabled)
+                    this.AntiDebug.Enable();
 #endif
 
                 Log.Information("[T2] AntiDebug OK!");
diff --git a/Dalamud/Game/Internal/AntiDebug.cs b/Dalamud/Game/Internal/AntiDebug.cs
index 04b107458..b7ca43b86 100644
--- a/Dalamud/Game/Internal/AntiDebug.cs
+++ b/Dalamud/Game/Internal/AntiDebug.cs
@@ -35,7 +35,7 @@ namespace Dalamud.Game.Internal
         /// <summary>
         /// Gets a value indicating whether the anti-debugging is enabled.
         /// </summary>
-        public bool IsEnabled { get; private set; }
+        public bool IsEnabled { get; private set; } = false;
 
         /// <summary>
         /// Enables the anti-debugging by overwriting code in memory.
diff --git a/Dalamud/Interface/DalamudInterface.cs b/Dalamud/Interface/DalamudInterface.cs
index 30f1534f5..8ac21a29a 100644
--- a/Dalamud/Interface/DalamudInterface.cs
+++ b/Dalamud/Interface/DalamudInterface.cs
@@ -198,7 +198,14 @@ namespace Dalamud.Interface
 
                         if (ImGui.MenuItem("Enable AntiDebug", null, this.dalamud.AntiDebug.IsEnabled))
                         {
-                            this.dalamud.AntiDebug.Enable();
+                            var newEnabled = !this.dalamud.AntiDebug.IsEnabled;
+                            if (newEnabled)
+                                this.dalamud.AntiDebug.Enable();
+                            else
+                                this.dalamud.AntiDebug.Disable();
+
+                            this.dalamud.Configuration.IsAntiAntiDebugEnabled = newEnabled;
+                            this.dalamud.Configuration.Save();
                         }
 
                         ImGui.Separator();