diff --git a/src/cascadia/TerminalConnection/AzureConnection.cpp b/src/cascadia/TerminalConnection/AzureConnection.cpp
index 42dc8419396..13d28c5a5bc 100644
--- a/src/cascadia/TerminalConnection/AzureConnection.cpp
+++ b/src/cascadia/TerminalConnection/AzureConnection.cpp
@@ -956,17 +956,15 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             _WriteStringWithNewline(RS_(L"AzureNoTokens"));
             return;
         }
-        while (credList.Size() > 0)
+
+        for (const auto& cred : credList)
         {
             try
             {
-                vault.Remove(credList.GetAt(0));
-            }
-            catch (...)
-            {
-                _WriteStringWithNewline(RS_(L"AzureTokensRemoved"));
-                return;
+                vault.Remove(cred);
             }
+            CATCH_LOG();
         }
+        _WriteStringWithNewline(RS_(L"AzureTokensRemoved"));
     }
 }