Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -r5d211a3d77e20d369319231f5534211caf58fec2 -r5af51ca3113e62827510441f40ad042a82301d04
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 5d211a3d77e20d369319231f5534211caf58fec2)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 5af51ca3113e62827510441f40ad042a82301d04)
@@ -161,11 +161,6 @@
 
     Connections { target: vAlarmStatus
         function onAlarm_PriorityChanged        ( vValue ) {
-            // When alarm status 0 is sent from HD to clear/hide the AlarmDialog, it comes with priority 0
-            // priority 0 has no clear definition; therefore, UI will set the coloring to the default system theme: blue.
-            // The blue color is confusing users, so we skip this coloring.
-                        if ( ! vValue ) return
-
             [
                 _alarmDialog.titleBarBackground,
                 _alarmDialog.titleBarForeground,
Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -r0536992850014cee0a949958ce56c0008615da41 -r5af51ca3113e62827510441f40ad042a82301d04
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 0536992850014cee0a949958ce56c0008615da41)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 5af51ca3113e62827510441f40ad042a82301d04)
@@ -117,6 +117,16 @@
     }
     // disabled coco end
 
+    //// ------ HIDE THE DIALOG - if has NO the alarm ------
+    // DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm
+    if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) {
+        hasAlarm(false);
+        _alarm_AlarmID = 0;
+        emit didAlarmEmpty();
+        return;
+    }
+
+    //// ----- SET PROPERTY VALUES ------
     // Look for this tag: #First_Time_Message_Sent_With_Silenced
     // this has to be first to make sure in the Notification dialog when we decided to show the dialog,
     // we should also consider checking the alarms Silenced and if it is already silenced,
@@ -150,29 +160,24 @@
     }
     alarm_Flag_alarmsCondition  (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION      ));
 
-    if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) {
-        hasAlarm(false);
-        emit didAlarmEmpty();
+    hasAlarm(true);
+
+    if (
+      //    alarm id properties
+           _alarm_AlarmIDChanged
+      ||   _alarm_PriorityChanged
+      //    alarm buttons
+      ||   _alarm_Flag_noResumeChanged
+      ||   _alarm_Flag_noRinsebackChanged
+      ||   _alarm_Flag_noEndTreatmentChanged
+      ||   _alarm_Flag_UserMustAckChanged
+      //    alarm cannot be minimized
+      || ( _alarm_Flag_noMinimizeChanged        &&   _alarm_Flag_noMinimize     )
+      //    alarm is out of silence
+      || ( _alarm_Flag_alarmsSilencedChanged    && ! _alarm_Flag_alarmsSilenced )
+      ){
+        emit didAlarmRaise();
     }
-    else {
-        hasAlarm(true);
-        if (
-          //    alarm id properties
-               _alarm_AlarmIDChanged
-          ||   _alarm_PriorityChanged
-          //    alarm buttons
-          ||   _alarm_Flag_noResumeChanged
-          ||   _alarm_Flag_noRinsebackChanged
-          ||   _alarm_Flag_noEndTreatmentChanged
-          ||   _alarm_Flag_UserMustAckChanged
-          //    alarm cannot be minimized
-          || ( _alarm_Flag_noMinimizeChanged        &&   _alarm_Flag_noMinimize     )
-          //    alarm is out of silence
-          || ( _alarm_Flag_alarmsSilencedChanged    && ! _alarm_Flag_alarmsSilenced )
-          ){
-             emit didAlarmRaise();
-        }
-    }
 }
 
 /*!
Index: sources/view/settings/VDuetRoWaterDG.h
===================================================================
diff -u -r1a9eb2756f33ec0387dd360e5c051ed9a04b9c1c -r5af51ca3113e62827510441f40ad042a82301d04
--- sources/view/settings/VDuetRoWaterDG.h	(.../VDuetRoWaterDG.h)	(revision 1a9eb2756f33ec0387dd360e5c051ed9a04b9c1c)
+++ sources/view/settings/VDuetRoWaterDG.h	(.../VDuetRoWaterDG.h)	(revision 5af51ca3113e62827510441f40ad042a82301d04)
@@ -84,7 +84,7 @@
     TRIGGER ( bool      , adjustment    , 0)
 
     TRIGGER ( bool      , status        , 0)
-    PROPERTY( QString   , notification  , 0)
+    PROPERTY( QString   , notification  ,"")
 
     VIEW_DEC_CLASS(VDuetRoWaterDG)
     VIEW_DEC_SLOT(DuetRoWaterStatDGqData)