diff --git a/UI/MainForm.cs b/UI/MainForm.cs
index 83c806db..3a74f4c5 100644
--- a/UI/MainForm.cs
+++ b/UI/MainForm.cs
@@ -796,6 +796,10 @@ private void Module_Connected(object sender, EventArgs e)
             // This board is not flashed yet
             if (module.ToMobiFlightModuleInfo()?.FirmwareInstallPossible() ?? false)
             {
+                // We can install firmware on this device but the user
+                // has asked us not to auto scan devices so we bail
+                if (!Properties.Settings.Default.FwAutoUpdateCheck) return;
+
                 PerformFirmwareInstallProcess(module.ToMobiFlightModuleInfo());
                 return;
             }