diff --git a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
index 2a89ede66d..9e72063911 100644
--- a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
@@ -124,8 +124,8 @@ public class DataService extends IntentService {
                     handleNewDataFromDexcomG5(intent);
                 }
             } else if (Intents.ACTION_NEW_SGV.equals(action)) {
-                // always backfill SGV from NS
-                handleNewDataFromNSClient(intent);
+                if (nsClientEnabled || SP.getBoolean(R.string.ns_autobackfill, true))
+                    handleNewDataFromNSClient(intent);
                 // Objectives 0
                 ObjectivesPlugin.bgIsAvailableInNS = true;
                 ObjectivesPlugin.saveProgress();
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index de7266826a..e396a0230e 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -872,4 +872,5 @@
     <string name="subcategory">Podkategorie</string>
     <string name="category">Kategorie</string>
     <string name="bolusrecordedonly">Bolus bude pouze zaznamenán</string>
+    <string name="ns_autobackfill">Automaticky doplňovat chybějící glykémie z NS</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8a525261cc..7cd12ea540 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -979,5 +979,7 @@
     <string name="category">Category</string>
     <string name="subcategory">Subcategory</string>
     <string name="bolusrecordedonly">Bolus will be recorded only</string>
+    <string name="ns_autobackfill">Autobackfill missig BGs from NS</string>
+    <string name="key_ns_autobackfill" translatable="false">ns_autobackfill</string>
 </resources>
 
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index bbfb9e6a2c..f6972cd179 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -22,6 +22,11 @@
             android:key="@string/key_nsclientinternal_api_secret"
             android:title="@string/nsclientinternal_secret_title" />
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_ns_autobackfill"
+            android:title="@string/ns_autobackfill" />
+
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_ns_logappstartedevent"