diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/DemoTasks/DefenderDemoExample.c b/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/DemoTasks/DefenderDemoExample.c
index ebc0ed93e..0a2031aae 100644
--- a/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/DemoTasks/DefenderDemoExample.c
+++ b/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/DemoTasks/DefenderDemoExample.c
@@ -564,7 +564,7 @@ static bool prvCollectDeviceMetrics( void )
     /* Collect custom metrics. This demo sends this task's stack high water mark
      * as a number type custom metric and the current task IDs as a list of
      * numbers type custom metric. */
-    if( eMetricsCollectorStatus == eMetricsCollectorSuccess )
+    if( eStatus == eMetricsCollectorSuccess )
     {
         vTaskGetInfo(
             /* Query this task. */
@@ -578,9 +578,9 @@ static bool prvCollectDeviceMetrics( void )
 
         if( uxTasksWritten == 0 )
         {
-            eMetricsCollectorStatus = eMetricsCollectorCollectionFailed;
+            eStatus = eMetricsCollectorCollectionFailed;
             LogError( ( "Failed to collect system state. uxTaskGetSystemState() failed due to insufficient buffer space.",
-                        eMetricsCollectorStatus ) );
+                        eStatus ) );
         }
         else
         {