Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc -ref73f9495cfa958bde5ba4208fe665ab8c612af7
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision ef73f9495cfa958bde5ba4208fe665ab8c612af7)
@@ -28,9 +28,9 @@
 TouchArea { id: _root
     readonly property string bloodSDSeparator: " / "    
 
-    readonly property string systolic  : _GuiView.dryDemoMode ? 140 : Variables.notSetVariable(vTreatmentVitals.systolic, 2)
-    readonly property string diastolic : _GuiView.dryDemoMode ? 90  : Variables.notSetVariable(vTreatmentVitals.diastolic, 2)
-    readonly property string heartRate : _GuiView.dryDemoMode ? 80  : Variables.notSetVariable(vTreatmentVitals.heartRate, 2)
+    readonly property string systolic  : Variables.notSetVariable(vTreatmentVitals.systolic, 2)
+    readonly property string diastolic : Variables.notSetVariable(vTreatmentVitals.diastolic, 2)
+    readonly property string heartRate : Variables.notSetVariable(vTreatmentVitals.heartRate, 2)
 
     x: 0
     y: 0
@@ -39,20 +39,20 @@
     Column {
         anchors.top: _root.top
         anchors.topMargin: 60
-        TextRect { id: _bloodPressure
+        TextRect { id: _bloodPressure        
             labelHeight: 60
             labelFont.pixelSize: Fonts.fontPixelVitals
             labelFont.weight: Font.ExtraLight
             labelAutoSize: true
-            label: systolic + bloodSDSeparator + diastolic
+            label: (_GuiView.dryDemoMode && systolic == "__" ? 140 : systolic) + bloodSDSeparator + (_GuiView.dryDemoMode && diastolic == "__" ? 90 : diastolic)
             extra: Variables.unitTextBloodPressure
         }
         TextRect { id: _heartBeat
             labelHeight: 40
             labelFont.pixelSize: Fonts.fontPixelVitals
             labelFont.weight: Font.ExtraLight
             labelAutoSize: true
-            label: heartRate
+            label: (_GuiView.dryDemoMode && heartRate == "__" ? 80 : heartRate)
             extra: Variables.unitTextHeartBeat
         }
     }