diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index 52e2cdca1..f327ffbdf 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -538,7 +538,7 @@ $result
                 {
                     if (token.IsCancellationRequested) { break; }
 
-                    using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, Credential, WsmanAuthentication, token, this))
+                    using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, Credential, WsmanAuthentication, isLocalHost : false, token, this))
                     {
                         bool itemRetrieved = false;
                         IEnumerable<CimInstance> mCollection = cimSession.QueryInstances(
@@ -594,7 +594,7 @@ $result
             {
                 try
                 {
-                    using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, Credential, WsmanAuthentication, token, this))
+                    using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, Credential, WsmanAuthentication, isLocalHost : false, token, this))
                     {
                         bool itemRetrieved = false;
                         IEnumerable<CimInstance> mCollection = cimSession.QueryInstances(
@@ -680,7 +680,7 @@ $result
                 {
                     if (token.IsCancellationRequested) { break; }
 
-                    using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, credential, wsmanAuthentication, token, cmdlet))
+                    using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, credential, wsmanAuthentication, isLocalHost : false, token, cmdlet))
                     {
                         bool itemRetrieved = false;
                         IEnumerable<CimInstance> mCollection = cimSession.QueryInstances(
@@ -1440,7 +1440,7 @@ $result
             try
             {
                 using (CancellationTokenSource cancelTokenSource = new CancellationTokenSource())
-                using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, credToUse, WsmanAuthentication, cancelTokenSource.Token, this))
+                using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, credToUse, WsmanAuthentication, isLocalhost, cancelTokenSource.Token, this))
                 {
                     var operationOptions = new CimOperationOptions
                     {
@@ -2115,7 +2115,7 @@ $result
                     return false;
                 }
 
-                using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(targetMachine, credInUse, authInUse, cancelToken, cmdlet))
+                using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(targetMachine, credInUse, authInUse, isLocalhost, cancelToken, cmdlet))
                 {
                     var methodParameters = new CimMethodParametersCollection();
                     int retVal;
@@ -2133,12 +2133,29 @@ $result
 
                     if (!InternalTestHooks.TestStopComputer)
                     {
-                        CimMethodResult result = cimSession.InvokeMethod(
-                            ComputerWMIHelper.CimOperatingSystemNamespace,
-                            ComputerWMIHelper.WMI_Class_OperatingSystem,
-                            ComputerWMIHelper.CimOperatingSystemShutdownMethod,
-                            methodParameters,
-                            operationOptions);
+                        CimMethodResult result = null;
+
+                        if (isLocalhost)
+                        {
+                            // Win32_ComputerSystem is a singleton hence FirstOrDefault() return the only instance returned by EnumerateInstances.
+                            var computerSystem = cimSession.EnumerateInstances(ComputerWMIHelper.CimOperatingSystemNamespace, ComputerWMIHelper.WMI_Class_OperatingSystem).FirstOrDefault();
+
+                            result = cimSession.InvokeMethod(
+                                ComputerWMIHelper.CimOperatingSystemNamespace,
+                                computerSystem,
+                                ComputerWMIHelper.CimOperatingSystemShutdownMethod,
+                                methodParameters,
+                                operationOptions);
+                        }
+                        else
+                        {
+                            result = cimSession.InvokeMethod(
+                                ComputerWMIHelper.CimOperatingSystemNamespace,
+                                ComputerWMIHelper.WMI_Class_OperatingSystem,
+                                ComputerWMIHelper.CimOperatingSystemShutdownMethod,
+                                methodParameters,
+                                operationOptions);
+                        }
 
                         retVal = Convert.ToInt32(result.ReturnValue.Value, CultureInfo.CurrentCulture);
                     }
diff --git a/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs b/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs
index 126527db1..0e404e273 100644
--- a/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs
+++ b/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs
@@ -975,9 +975,15 @@ namespace System.Management.Automation
             string computerName,
             PSCredential credential,
             string authentication,
+            bool isLocalHost,
             CancellationToken cancellationToken,
             PSCmdlet cmdlet)
         {
+            if (isLocalHost)
+            {
+                return CimSession.Create(null);
+            }
+
             var sessionOptions = new CimSessionOptions();
 
             CimCredential cimCredentials = GetCimCredentials(authentication, credential);