diff --git a/functions/DiskSmartInfo.completers.ps1 b/functions/DiskSmartInfo.completers.ps1
index ded4394..3eca93b 100644
--- a/functions/DiskSmartInfo.completers.ps1
+++ b/functions/DiskSmartInfo.completers.ps1
@@ -114,10 +114,18 @@ class DiskCompleter : IArgumentCompleter
             {
                 $sessionParameters.Add('Credential', $fakeBoundParameters.Credential)
             }
-            if ($cimSession = New-CimSession @sessionParameters)
+
+            $option = [Microsoft.Management.Infrastructure.Options.WSManSessionOptions]::new()
+            $option.Timeout = New-TimeSpan -Seconds 1
+
+            if ($cimSession = New-CimSession -SessionOption $option @sessionParameters)
             {
                 $instanceParameters.Add('CimSession', $cimSession)
             }
+            else
+            {
+                return $result
+            }
         }
         elseif  ($fakeBoundParameters.ContainsKey('CimSession'))
         {