diff --git a/metals/src/main/scala/scala/meta/internal/metals/PopupChoiceReset.scala b/metals/src/main/scala/scala/meta/internal/metals/PopupChoiceReset.scala
index 192b195941d..dc8b63b7398 100644
--- a/metals/src/main/scala/scala/meta/internal/metals/PopupChoiceReset.scala
+++ b/metals/src/main/scala/scala/meta/internal/metals/PopupChoiceReset.scala
@@ -35,13 +35,13 @@ class PopupChoiceReset(
       Future.successful(())
     } else if (value == BuildServer) {
       scribe.info("Resetting build server selection.")
-      (for {
+      for {
         didChange <- bspConnector.switchBuildServer(
           workspace,
           slowConnect,
         )
-        if didChange
-      } yield quickConnect()).ignoreValue
+        _ <- if (didChange) quickConnect() else Future.successful(())
+      } yield ()
     } else {
       Future.successful(())
     }