diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java
index 896782f720..80785ec7fe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceDexcomG5Plugin.java
@@ -71,7 +71,7 @@ public class SourceDexcomG5Plugin extends PluginBase implements BgSourceInterfac
                 bgReading.date = json.getLong("m_time") * 1000L;
                 bgReading.raw = 0;
                 bgReading.filtered = true;
-                bgReading.sourcePlugin = SourceDexcomG5Plugin.getPlugin().getName();
+                bgReading.sourcePlugin = getName();
                 boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, getName());
                 if (isNew) {
                     bgReadings.add(bgReading);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceGlimpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceGlimpPlugin.java
index 416d51f095..ee9ff1424f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceGlimpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceGlimpPlugin.java
@@ -46,7 +46,7 @@ public class SourceGlimpPlugin extends PluginBase implements BgSourceInterface {
         bgReading.date = bundle.getLong("myTimestamp");
         bgReading.raw = 0;
         bgReading.filtered = false;
-        bgReading.sourcePlugin = SourceGlimpPlugin.getPlugin().getName();
+        bgReading.sourcePlugin = getName();
 
         boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, getName());
         return isNew ? Lists.newArrayList(bgReading) : Collections.emptyList();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceMM640gPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceMM640gPlugin.java
index 62bf95bc7c..84a3cd5427 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceMM640gPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceMM640gPlugin.java
@@ -65,7 +65,7 @@ public class SourceMM640gPlugin extends PluginBase implements BgSourceInterface
                                 bgReading.date = json_object.getLong("date");
                                 bgReading.raw = json_object.getDouble("sgv");
                                 bgReading.filtered = true;
-                                bgReading.sourcePlugin = SourceMM640gPlugin.getPlugin().getName();
+                                bgReading.sourcePlugin = getName();
 
                                 boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, getName());
                                 if (isNew) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java
index 1a1081ef6c..b082fc95b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java
@@ -65,6 +65,8 @@ public class SourceNSClientPlugin extends PluginBase implements BgSourceInterfac
                 for (int i = 0; i < jsonArray.length(); i++) {
                     JSONObject sgvJson = jsonArray.getJSONObject(i);
                     BgReading bgReading = new BgReading(new NSSgv(sgvJson));
+                    bgReading.filtered = false;
+                    bgReading.sourcePlugin = getName();
                     boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "NS");
                     if (isNew) {
                         sgvs.add(bgReading);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourcePoctechPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourcePoctechPlugin.java
index 793e367a34..a2953eb2cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourcePoctechPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourcePoctechPlugin.java
@@ -66,6 +66,8 @@ public class SourcePoctechPlugin extends PluginBase implements BgSourceInterface
                 bgReading.direction = json.getString("direction");
                 bgReading.date = json.getLong("date");
                 bgReading.raw = json.getDouble("raw");
+                bgReading.filtered = false;
+                bgReading.sourcePlugin = getName();
                 if (JsonHelper.safeGetString(json, "utils", Constants.MGDL).equals("mmol/L"))
                     bgReading.value = bgReading.value * Constants.MMOLL_TO_MGDL;
                 boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, getName());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java
index 9dfcf85dd2..6349d9050b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java
@@ -47,8 +47,8 @@ public class SourceXdripPlugin extends PluginBase implements BgSourceInterface {
         bgReading.direction = bundle.getString(Intents.EXTRA_BG_SLOPE_NAME);
         bgReading.date = bundle.getLong(Intents.EXTRA_TIMESTAMP);
         bgReading.raw = bundle.getDouble(Intents.EXTRA_RAW);
-        bgReading.sourcePlugin = SourceXdripPlugin.getPlugin().getName();
         bgReading.filtered = Objects.equals(bundle.getString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION), "G5 Native");
+        bgReading.sourcePlugin = getName();
 
         boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, getName());
         return isNew ? Lists.newArrayList(bgReading) : Collections.emptyList();