diff --git a/src/app/[org]/[env]/layout.tsx b/src/app/[org]/[env]/layout.tsx
index cb195f80..c48f1016 100644
--- a/src/app/[org]/[env]/layout.tsx
+++ b/src/app/[org]/[env]/layout.tsx
@@ -20,13 +20,15 @@ export default function EnvLayout({ children }: { children: ReactNode }) {
   const { useSession } = authClient;
   const { useActiveOrganization } = authClient;
   const { data: activeOrganization } = useActiveOrganization();
-  const { setActiveEnvironment } = useEnvironmentStore();
+  const { setActiveEnvironment, activeEnvironment } = useEnvironmentStore();
   const { activePage } = usePageStore();
   const { data: session, isPending: isPendingSession } = useSession();
   const user = session?.user;
+  const currentEnvSlug = params?.env as string;
+  const checkPing =
+    activeEnvironment?.type === "localhost" || currentEnvSlug === "localhost";
 
   const { localhostData, isLoadingLocalhost, isErrorLocalhost } = usePing();
-  const currentEnvSlug = params?.env as string;
 
   const [isExpanded, setIsExpanded] = useState(false);
 
@@ -72,7 +74,7 @@ export default function EnvLayout({ children }: { children: ReactNode }) {
     );
   }, [activeOrganization]);
 
-  if (isLoadingLocalhost) return <></>;
+  if (checkPing && isLoadingLocalhost) return <></>;
 
   return isErrorLocalhost && currentEnvSlug === "localhost" ? (
     <div className="mt-32 flex justify-center">
diff --git a/src/hooks/usePing.ts b/src/hooks/usePing.ts
index 08f75386..89212f92 100644
--- a/src/hooks/usePing.ts
+++ b/src/hooks/usePing.ts
@@ -1,8 +1,9 @@
 import { useApiClients } from "@/context/api-provider";
+
 import { useQuery } from "@connectrpc/connect-query";
 import { ping } from "api/js/svc/localhost/v1/service-LocalhostService_connectquery";
 
-export const usePing = () => {
+export const usePing = (enabled: boolean = true) => {
   const { apiClients } = useApiClients();
 
   const {
@@ -16,6 +17,7 @@ export const usePing = () => {
       refetchInterval: 5000,
       placeholderData: (prev) => prev,
       transport: apiClients?.localhostTransport,
+      enabled,
     },
   );