diff --git a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java
index 67d5e8c1..86ebf503 100644
--- a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java
+++ b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java
@@ -92,6 +92,7 @@ kv4p HT (see http://kv4p.com)
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -515,8 +516,11 @@ public void run() {
                     runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
-                            radioAudioService.setRadioType(moduleTypeSetting.value.equals("UHF") ?
-                                    RadioAudioService.RADIO_MODULE_UHF : RadioAudioService.RADIO_MODULE_VHF);
+                            radioAudioService.setRadioType(
+                                "UHF".equals(Optional.ofNullable(moduleTypeSetting).map(setting -> setting.value).orElse("VHF"))
+                                    ? RadioAudioService.RADIO_MODULE_UHF
+                                    : RadioAudioService.RADIO_MODULE_VHF
+                            );
                             radioAudioService.start();
                         }
                     });