Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -rb12853c86ef9e517667516dc3e47bca07349cedf -r80b727733768477975addc967b3d6b04ed39e598
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision b12853c86ef9e517667516dc3e47bca07349cedf)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision 80b727733768477975addc967b3d6b04ed39e598)
@@ -170,6 +170,12 @@
     Connections { target: vTreatmentVitals
         // On Timeout - Vitals Request
         function onDidTimeout () {
+            if ( ! vTreatmentVitals.interval ) {
+                // TODO: interval set to OFF but 15 min default timer still running
+                return
+            }
+
+            // On Timeout request vitas if BP cuff is enabled or shjow popup for manual entry
             if ( vTreatmentVitals.enableBPCuff ) {
                 vTreatmentAdjustmentVitals.doRequest()
                 vTreatmentVitals.doTimerStart()
Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp
===================================================================
diff -u -rb12853c86ef9e517667516dc3e47bca07349cedf -r80b727733768477975addc967b3d6b04ed39e598
--- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp	(.../VCommonAdjustmentVitals.cpp)	(revision b12853c86ef9e517667516dc3e47bca07349cedf)
+++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp	(.../VCommonAdjustmentVitals.cpp)	(revision 80b727733768477975addc967b3d6b04ed39e598)
@@ -179,15 +179,15 @@
  */
 void View::VTreatmentVitals::updateTimer()
 {
-    int interval = _interval && _enableBPCuff ? _interval : _defaultInterval;
+    int interval = _interval ? _interval : _defaultInterval;
     _now = QDateTime::currentDateTime();
 
     // minutes past last interval mark
     int past = _now.time().minute() % interval;
     int currentCount = past * 60 + _now.time().second();
 
     // Seconds since the last interval mark
-    if ( _interval && _enableBPCuff ) { totalCount( currentCount ); }
+    if ( _interval ) { totalCount( currentCount ); }
 
     // Seconds until the next interval mark
     int totalSecLeft = interval * 60 - currentCount;
@@ -199,7 +199,7 @@
     }
 
     // construct count down string
-    if ( _interval && _enableBPCuff ) {
+    if ( _interval ) {
         int counter_min  = totalSecLeft / 60;
         int counter_sec  = totalSecLeft % 60;
         countdown( QStringLiteral("%1:%2")  .arg(counter_min,2,10,QChar('0'))