diff --git a/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt
index 7e41f8e6e..210c06acc 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt
@@ -292,7 +292,8 @@ fun RadioConfigNavHost(
             viewModel.clearPacketResponse()
         },
         onComplete = {
-            navController.navigate(radioConfigState.route)
+            val route = radioConfigState.route
+            if (route.isNotEmpty()) navController.navigate(route)
             viewModel.clearPacketResponse()
         }
     )