diff --git a/src/components/connections/ConnectionSelector.tsx b/src/components/connections/ConnectionSelector.tsx
index 271bdcc..6462b07 100644
--- a/src/components/connections/ConnectionSelector.tsx
+++ b/src/components/connections/ConnectionSelector.tsx
@@ -38,7 +38,6 @@ export function ConnectionSelector() {
             />
           )}
           <SelectValue placeholder="Select connection" />
-          <EnvironmentBadge environment={activeConn?.environment} size="sm" />
         </div>
       </SelectTrigger>
       <SelectContent>
diff --git a/src/components/layout/Toolbar.tsx b/src/components/layout/Toolbar.tsx
index aae2657..1a46083 100644
--- a/src/components/layout/Toolbar.tsx
+++ b/src/components/layout/Toolbar.tsx
@@ -10,7 +10,6 @@ import { useConnections } from "@/hooks/use-connections";
 import { Database, Plus } from "lucide-react";
 import type { ConnectionConfig, Tab } from "@/types";
 import { getEnvironment } from "@/lib/environment";
-import { EnvironmentBadge } from "@/components/connections/EnvironmentBadge";
 
 export function Toolbar() {
   const [listOpen, setListOpen] = useState(false);
@@ -58,13 +57,6 @@ export function Toolbar() {
 
         <ReadOnlyToggle />
 
-        {activeConn?.environment && (
-          <>
-            <Separator orientation="vertical" className="h-5" />
-            <EnvironmentBadge environment={activeConn.environment} size="sm" />
-          </>
-        )}
-
         <Separator orientation="vertical" className="h-5" />
 
         <Button