diff --git a/src/PowerShell/CommonFiles/PowerShellCmdlet.cs b/src/PowerShell/CommonFiles/PowerShellCmdlet.cs
index 03d4ea188e..bd66db5ef7 100644
--- a/src/PowerShell/CommonFiles/PowerShellCmdlet.cs
+++ b/src/PowerShell/CommonFiles/PowerShellCmdlet.cs
@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="PowerShellCmdlet.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -281,6 +281,7 @@ internal void Wait(Task runningTask, PowerShellCmdlet? writeCmdlet = null)
                     {
                         try
                         {
+                            this.pwshThreadEdi = null;
                             this.pwshThreadAction();
                         }
                         catch (Exception e)
@@ -596,12 +597,17 @@ private void WaitMainThreadActionCompletion()
                 this.pwshThreadActionCompleted.WaitHandle,
             });
 
-            if (this.pwshThreadEdi != null)
+            try
             {
-                this.pwshThreadEdi.Throw();
+                if (this.pwshThreadEdi != null)
+                {
+                    this.pwshThreadEdi.Throw();
+                }
+            }
+            finally
+            {
+                this.semaphore.Release();
             }
-
-            this.semaphore.Release();
         }
 
         private class QueuedStream