diff --git a/adapters/powershell/psDscAdapter/powershell.resource.ps1 b/adapters/powershell/psDscAdapter/powershell.resource.ps1
index 46f0794da..3cdbaf985 100644
--- a/adapters/powershell/psDscAdapter/powershell.resource.ps1
+++ b/adapters/powershell/psDscAdapter/powershell.resource.ps1
@@ -41,8 +41,8 @@ trap {
 
 function Write-TraceQueue() {
     $trace = $null
-    while (!$traceQueue.IsEmpty) {
-        if ($traceQueue.TryDequeue([ref] $trace)) {
+    if (!$traceQueue.IsEmpty) {
+        while ($traceQueue.TryDequeue([ref] $trace)) {
             $host.ui.WriteErrorLine(($trace | ConvertTo-Json -Compress -Depth 10))
         }
     }
diff --git a/resources/PSScript/psscript.ps1 b/resources/PSScript/psscript.ps1
index 48ed86a38..81d8138e7 100644
--- a/resources/PSScript/psscript.ps1
+++ b/resources/PSScript/psscript.ps1
@@ -127,9 +127,9 @@ $outputObjects = [System.Collections.Generic.List[Object]]::new()
 
 function Write-TraceQueue() {
     $trace = $null
-    while (!$traceQueue.IsEmpty) {
-        if ($traceQueue.TryDequeue([ref] $trace)) {
-            $host.ui.WriteErrorLine($trace)
+    if (!$traceQueue.IsEmpty) {
+        while ($traceQueue.TryDequeue([ref] $trace)) {
+            $host.ui.WriteErrorLine(($trace | ConvertTo-Json -Compress -Depth 10))
         }
     }
 }