diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientPlugin.java
index 004c7646f5..0525a3a9dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSClientPlugin.java
@@ -135,7 +135,7 @@ public class NSClientPlugin extends PluginBase {
     public void onStatusEvent(final EventNetworkChange ev) {
         boolean wifiOnly = SP.getBoolean(R.string.key_ns_wifionly, false);
         String allowedSSIDs = SP.getString(R.string.key_ns_wifi_ssids, "");
-        boolean allowRoaming = SP.getBoolean(R.string.key_ns_allowroaming, true);
+        boolean allowRoaming = SP.getBoolean(R.string.key_ns_allowroaming, true) && !wifiOnly;
 
         boolean newAllowedState = true;
 
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index 0567885a2c..3a7dc91d4b 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -90,6 +90,7 @@
             <SwitchPreference
                 android:defaultValue="false"
                 android:key="@string/key_ns_wifionly"
+                android:disableDependentsState="true"
                 android:title="@string/ns_wifionly" />
 
             <EditTextPreference
@@ -100,6 +101,7 @@
 
             <SwitchPreference
                 android:defaultValue="true"
+                android:dependency="@string/key_ns_wifionly"
                 android:key="@string/key_ns_allowroaming"
                 android:title="@string/ns_allowroaming" />