diff --git a/app/src/debug/assets/firmware b/app/src/debug/assets/firmware
new file mode 120000
index 000000000..e4a11c5bf
--- /dev/null
+++ b/app/src/debug/assets/firmware
@@ -0,0 +1 @@
+../../../../../meshtastic-esp32/release/latest/bins
\ No newline at end of file
diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index 28c0b8731..51d30f5f4 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1461,6 +1461,8 @@ class MeshService : Service(), Logging {
             errormsg("Unable to update", ex)
             null
         }
+
+        debug("setFirmwareUpdateFilename $firmwareUpdateFilename")
     }
 
     private fun doFirmwareUpdate() {
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 956ec7bde..5c7f95f0c 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -504,7 +504,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
 
         // If actively connected possibly let the user update firmware
         val info = model.myNodeInfo.value
-        if (connected == MeshService.ConnectionState.CONNECTED && info != null && info.shouldUpdate) {
+        if (connected == MeshService.ConnectionState.CONNECTED && info != null && info.shouldUpdate && info.couldUpdate) {
             updateFirmwareButton.visibility = View.VISIBLE
             updateFirmwareButton.text =
                 getString(R.string.update_to).format(getString(R.string.cur_firmware_version))