diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
index e8dcfbe254a..c21165301e2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
@@ -36,16 +36,15 @@ protected override void ProcessRecord()
             {
                 TimeSpan uptime = TimeSpan.FromSeconds(Stopwatch.GetTimestamp() / Stopwatch.Frequency);
 
-                switch (ParameterSetName)
+                if (Since)
                 {
-                    case TimespanParameterSet:
-                        // return TimeSpan of time since the system started up
-                        WriteObject(uptime);
-                        break;
-                    case SinceParameterSet:
-                        // return Datetime when the system started up
-                        WriteObject(DateTime.Now.Subtract(uptime));
-                        break;
+                    // Output the time of the last system boot.
+                    WriteObject(DateTime.Now.Subtract(uptime));
+                }
+                else
+                {
+                    // Output the time elapsed since the last system boot.
+                    WriteObject(uptime);
                 }
             }
             else
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Uptime.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Uptime.Tests.ps1
index aff5e4d50af..b3275a61f2a 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Uptime.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Uptime.Tests.ps1
@@ -25,6 +25,10 @@ Describe "Get-Uptime" -Tags "CI" {
         $upt = Get-Uptime -Since
         $upt | Should -BeOfType DateTime
     }
+    It "Get-Uptime -Since:`$false return TimeSpan" {
+        $upt = Get-Uptime -Since:$false
+        $upt | Should -BeOfType TimeSpan
+    }
     It "Get-Uptime throw if IsHighResolution == false" {
         # Enable the test hook
         [system.management.automation.internal.internaltesthooks]::SetTestHook('StopwatchIsNotHighResolution', $true)