diff --git a/scripts/Common/Scripts/Operations.ps1 b/scripts/Common/Scripts/Operations.ps1
index 32f124fe..ad264429 100644
--- a/scripts/Common/Scripts/Operations.ps1
+++ b/scripts/Common/Scripts/Operations.ps1
@@ -25,7 +25,7 @@ $null = New-Module {
 
     function Start-Operation {
         param(
-            [switch] $NonInteractive,
+            [switch] $NonInteractive = ((Get-Stage) -eq ([SetupStage]::OneShot)),
             [switch] $NoImplicitCleanup,
             [scriptblock] $Action
         )