diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
index e0a8c51dec..c9d392b963 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -2622,7 +2622,7 @@ private void updateCurrentBgInfoCommon(DexCollectionType collector, TextView not
         if (!isSensorActive) {
             // Define a variable (notConnectedToG6Yet) that is only true if Native G6 is chosen, but, transmitter days is unknown.
             boolean notConnectedToG6Yet = DexCollectionType.getDexCollectionType() == DexcomG5 && Pref.getBooleanDefaultFalse("ob1_g5_use_transmitter_alg") && Pref.getBooleanDefaultFalse("using_g6") && DexTimeKeeper.getTransmitterAgeInDays(getTransmitterID()) == -1;
-            if (notConnectedToG6Yet) { // Only if G6 has been selected and transmitter days is unknown.
+            if (notConnectedToG6Yet || shortTxId()) { // Only if G6 has been selected and transmitter days is unknown, or if G7 has been selected.
                 notificationText.setText(R.string.wait_to_connect);
             } else { // Only if G6 is not selected or G6 transmitter days is known.
                 notificationText.setText(R.string.now_start_your_sensor);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
index d392ac96bf..643bfc08da 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
@@ -55,6 +55,9 @@ public static boolean processTreatmentResponse(final String response) throws Exc
             } catch (JSONException e) {
                 //
             }
+
+            boolean skip_from_xdrip = Pref.getBooleanDefaultFalse("cloud_storage_api_skip_download_from_xdrip");
+
             // extract blood test data if present
             try {
                 if (!from_xdrip) {
@@ -130,7 +133,7 @@ public static boolean processTreatmentResponse(final String response) throws Exc
                     Treatments existing = Treatments.byuuid(nightscout_id);
                     if (existing == null)
                         existing = Treatments.byuuid(uuid);
-                    if ((existing == null) && (!from_xdrip)) {
+                    if ((existing == null) && !(from_xdrip && skip_from_xdrip)) {
                         // check for close timestamp duplicates perhaps
                         existing = Treatments.byTimestamp(timestamp, 60000);
                         if (!((existing != null) && (JoH.roundDouble(existing.insulin, 2) == JoH.roundDouble(insulin, 2))
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 00219735a4..b20bc3b717 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1207,6 +1207,8 @@
     <string name="use_mobile_data">Use mobile data</string>
     <string name="summary_cloud_storage_api_download_enable">Also try to download treatments from Nightscout</string>
     <string name="title_cloud_storage_api_download_enable">Download treatments</string>
+    <string name="title_cloud_storage_api_download_from_xdrip">Skip items from xDrip</string>
+    <string name="summary_cloud_storage_api_download_from_xdrip">Avoid downloading items uploaded by xDrip</string>
     <string name="summary_bluetooth_meter_for_calibrations_auto">Calibrate using new blood glucose readings if the conditions appear right to do so without asking confirmation (experimental)</string>
     <string name="title_bluetooth_meter_for_calibrations_auto">Automatic Calibration</string>
     <string name="title_rest_api_extra_options">Extra Options</string>
diff --git a/app/src/main/res/xml/pref_data_source.xml b/app/src/main/res/xml/pref_data_source.xml
index 18e20cd92b..65d9f3c78d 100644
--- a/app/src/main/res/xml/pref_data_source.xml
+++ b/app/src/main/res/xml/pref_data_source.xml
@@ -192,11 +192,21 @@
             android:singleLine="true"
             android:summary="@string/summary_nsfollow_url"
             android:title="@string/title_nsfollow_url" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="nsfollow_download_treatments"
-            android:summary="@string/summary_nsfollow_download_treatments"
-            android:title="@string/title_nsfollow_download_treatments" />
+        <PreferenceScreen
+            android:key="_nsfollow_download_treatments_screen"
+            android:title="@string/title_nsfollow_download_treatments">
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="nsfollow_download_treatments"
+                android:summary="@string/summary_nsfollow_download_treatments"
+                android:title="@string/title_nsfollow_download_treatments" />
+            <SwitchPreference
+                android:defaultValue="true"
+                android:dependency="nsfollow_download_treatments"
+                android:key="cloud_storage_api_skip_download_from_xdrip"
+                android:summary="@string/summary_cloud_storage_api_download_from_xdrip"
+                android:title="@string/title_cloud_storage_api_download_from_xdrip" />
+        </PreferenceScreen>
         <ListPreference
             android:defaultValue="0"
             android:key="nsfollow_lag"
diff --git a/app/src/main/res/xml/pref_data_sync.xml b/app/src/main/res/xml/pref_data_sync.xml
index b15198054d..711934a994 100644
--- a/app/src/main/res/xml/pref_data_sync.xml
+++ b/app/src/main/res/xml/pref_data_sync.xml
@@ -47,12 +47,23 @@
                     android:key="cloud_storage_api_base"
                     android:title="@string/pref_title_api_url" />
 
-                <SwitchPreference
-                    android:defaultValue="true"
-                    android:dependency="cloud_storage_api_enable"
-                    android:key="cloud_storage_api_download_enable"
-                    android:summary="@string/summary_cloud_storage_api_download_enable"
-                    android:title="@string/title_cloud_storage_api_download_enable" />
+                <PreferenceScreen
+                    android:key="download_treatments_screen"
+                    android:title="@string/title_cloud_storage_api_download_enable"
+                    android:dependency="cloud_storage_api_enable">
+                    <SwitchPreference
+                        android:defaultValue="true"
+                        android:dependency="cloud_storage_api_enable"
+                        android:key="cloud_storage_api_download_enable"
+                        android:summary="@string/summary_cloud_storage_api_download_enable"
+                        android:title="@string/title_cloud_storage_api_download_enable" />
+                    <SwitchPreference
+                        android:defaultValue="true"
+                        android:dependency="cloud_storage_api_download_enable"
+                        android:key="cloud_storage_api_skip_download_from_xdrip"
+                        android:summary="@string/summary_cloud_storage_api_download_from_xdrip"
+                        android:title="@string/title_cloud_storage_api_download_from_xdrip" />
+                </PreferenceScreen>
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:dependency="cloud_storage_api_download_enable"