diff --git a/apps/app/src/components/pickers/EnvironmentPicker.test.tsx b/apps/app/src/components/pickers/EnvironmentPicker.test.tsx
index 73c87bebd3..df917be8e6 100644
--- a/apps/app/src/components/pickers/EnvironmentPicker.test.tsx
+++ b/apps/app/src/components/pickers/EnvironmentPicker.test.tsx
@@ -615,7 +615,7 @@ describe("EnvironmentPickerUI multi-machine menu", () => {
       screen
         .getByText("MacBook Pro")
         .parentElement?.querySelector('[data-icon="Laptop"]'),
-    ).not.toBeNull();
+    ).toBeNull();
 
     const checkoutItems = screen.getAllByRole("menuitem", {
       name: /Project checkout/u,
diff --git a/apps/app/src/components/pickers/EnvironmentPicker.tsx b/apps/app/src/components/pickers/EnvironmentPicker.tsx
index 5616a6ba1a..4be5298e93 100644
--- a/apps/app/src/components/pickers/EnvironmentPicker.tsx
+++ b/apps/app/src/components/pickers/EnvironmentPicker.tsx
@@ -41,7 +41,6 @@ import {
 } from "./environment-picker-value";
 import { selectHosts } from "@/hooks/queries/host-queries";
 import { providerInputsControlRequired } from "./environment-provider-inputs";
-import { MachineLabel } from "@/components/machines/MachineLabel";
 
 interface SelectedEnvironment {
   modeLabel: string;
@@ -619,7 +618,7 @@ function MachineSection({
       <DropdownMenuLabel className="min-w-0 text-muted-foreground">
         <span className="flex items-center gap-1.5">
           <MachineStatusDot connected={connected} />
-          <MachineLabel host={host} iconClassName="size-3" />
+          <span className="min-w-0 truncate">{host.name}</span>
           {isThisMachine ? (
             <span className={MACHINE_BADGE_CLASS_NAME}>this machine</span>
           ) : null}