Index: NVDataMgmt.c
===================================================================
diff -u -r3cd202c02a1cca634162edcb5311c6eb589d1ea7 -r80336217ee14b1f844f34f354c66cb46b054bfeb
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3cd202c02a1cca634162edcb5311c6eb589d1ea7)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 80336217ee14b1f844f34f354c66cb46b054bfeb)
@@ -7,8 +7,8 @@
 *
 * @file    NVDataMgmt.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      10-Sep-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      02-Oct-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  12-Feb-2020
@@ -4010,7 +4010,10 @@
     U32 tempIndex;
     PROCESS_RECORD_JOB_T tempJob;
     BOOL status        = FALSE;
+
+#ifdef _HD_
     BOOL checkUIStatus = TRUE;
+#endif
 
     // Initialize the structure per CppCheck run
     tempJob.memoryLocation  = NVDATAMGMT_EEPROM;
@@ -4026,22 +4029,28 @@
     }
     _enable_IRQ();
 
+    if ( NVDATAMGMT_RTC == tempJob.memoryLocation )
+    {
 #ifdef _HD_
-    checkUIStatus = ( TRUE == uiCommunicated() ? TRUE : FALSE );
+        if ( TRUE == uiCommunicated() )
 #endif
-
-    if ( ( NVDATAMGMT_RTC == tempJob.memoryLocation ) && ( TRUE == checkUIStatus ) )
-    {
-        if ( ( RTC_RAM_STATE_READY == getRTCRAMState() ) && ( TRUE == getSemaphore( SEMAPHORE_RTC ) ) )
         {
-            status = TRUE;
+            if ( ( RTC_RAM_STATE_READY == getRTCRAMState() ) && ( TRUE == getSemaphore( SEMAPHORE_RTC ) ) )
+            {
+                status = TRUE;
+            }
         }
     }
-    else if ( ( NVDATAMGMT_EEPROM == tempJob.memoryLocation ) && ( TRUE == checkUIStatus ) )
+    else if ( NVDATAMGMT_EEPROM == tempJob.memoryLocation )
     {
-        if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY )
+#ifdef _HD_
+        if ( TRUE == uiCommunicated() )
+#endif
         {
-            status = TRUE;
+            if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY )
+            {
+                status = TRUE;
+            }
         }
     }