diff --git a/Module/Cmdlets/FIDO2/ConnectYubikeyFIDO2.cs b/Module/Cmdlets/FIDO2/ConnectYubikeyFIDO2.cs
index cfa1d90..e7af350 100644
--- a/Module/Cmdlets/FIDO2/ConnectYubikeyFIDO2.cs
+++ b/Module/Cmdlets/FIDO2/ConnectYubikeyFIDO2.cs
@@ -34,7 +34,8 @@ public class ConnectYubikeyFIDO2Command : PSCmdlet, IDynamicParameters
         // Get dynamic parameters based on YubiKey state
         public object GetDynamicParameters()
         {
-            try { YubiKeyModule.ConnectYubikey(); } catch { }
+            // Block this out so that Cmdlet tab completion does not call Connect-Yubikey
+            // try { YubiKeyModule.ConnectYubikey(); } catch { }
 
             Collection<Attribute> PIN;
             if (YubiKeyModule._yubikey is not null)