diff --git a/xdrip/Core Data/classes/TreatmentEntry+CoreDataClass.swift b/xdrip/Core Data/classes/TreatmentEntry+CoreDataClass.swift
index e2cd996c..71a8f8e9 100644
--- a/xdrip/Core Data/classes/TreatmentEntry+CoreDataClass.swift	
+++ b/xdrip/Core Data/classes/TreatmentEntry+CoreDataClass.swift	
@@ -282,7 +282,7 @@ public class TreatmentEntry: NSManagedObject, Comparable {
         case .BgCheck:
             dict["eventType"] = "BG Check" // maybe overwritten in next statement
             dict["glucose"] = self.value
-            dict["glucoseType"] = "Finger"
+            dict["glucoseType"] = "Finger" + String(!UserDefaults.standard.bloodGlucoseUnitIsMgDl ? ": " + self.value.mgdlToMmolAndToString(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) + " " + Texts_Common.mmol : "")
             dict["units"] = ConstantsNightScout.mgDlNightscoutUnitString
 		default:
 			break
diff --git a/xdrip/Managers/NightScout/NightScoutUploadManager.swift b/xdrip/Managers/NightScout/NightScoutUploadManager.swift
index bda42f40..17cefbb6 100644
--- a/xdrip/Managers/NightScout/NightScoutUploadManager.swift
+++ b/xdrip/Managers/NightScout/NightScoutUploadManager.swift
@@ -604,6 +604,7 @@ public class NightScoutUploadManager: NSObject {
                 case .BgCheck:
                     treatmentToUploadToNightscoutAsDictionary["glucose"] = otherTreatmentEntry.value
                     treatmentToUploadToNightscoutAsDictionary["units"] = ConstantsNightScout.mgDlNightscoutUnitString
+                    treatmentToUploadToNightscoutAsDictionary["glucoseType"] = "Finger" + String(!UserDefaults.standard.bloodGlucoseUnitIsMgDl ? ": " + otherTreatmentEntry.value.mgdlToMmolAndToString(mgdl: UserDefaults.standard.bloodGlucoseUnitIsMgDl) + " " + Texts_Common.mmol : "")
                     
                 default:
                     break