diff --git a/apps/web/app/environments/[environmentId]/EnvironmentsNavbar.tsx b/apps/web/app/environments/[environmentId]/EnvironmentsNavbar.tsx
index 58751a08d6..cb4fb04cfb 100644
--- a/apps/web/app/environments/[environmentId]/EnvironmentsNavbar.tsx
+++ b/apps/web/app/environments/[environmentId]/EnvironmentsNavbar.tsx
@@ -55,6 +55,7 @@ interface EnvironmentsNavbarProps {
 
 export default function EnvironmentsNavbar({ environmentId, session }: EnvironmentsNavbarProps) {
   const router = useRouter();
+  const [loading, setLoading] = useState(false);
   const { environment, isErrorEnvironment, isLoadingEnvironment } = useEnvironment(environmentId);
   const pathname = usePathname();
 
@@ -180,7 +181,7 @@ export default function EnvironmentsNavbar({ environmentId, session }: Environme
     router.push(`/environments/${newEnvironmentId}/`);
   };
 
-  if (isLoadingEnvironment) {
+  if (isLoadingEnvironment || loading) {
     return <LoadingSpinner />;
   }
 
@@ -328,12 +329,9 @@ export default function EnvironmentsNavbar({ environmentId, session }: Environme
                     <div className="flex items-center">
                       <ArrowRightOnRectangleIcon className="mr-2 h-4 w-4" />
                       <button
-                        onClick={async () => {
-                          try {
-                            await signOut();
-                          } catch (error) {
-                            console.error("Failed to sign out:", error);
-                          }
+                        onClick={() => {
+                          signOut();
+                          setLoading(true);
                         }}>
                         Logout
                       </button>
diff --git a/apps/web/app/environments/[environmentId]/integrations/alerts/slack/AddSlackAlertModal.tsx b/apps/web/app/environments/[environmentId]/integrations/alerts/slack/AddSlackAlertModal.tsx
index 5a68bc991d..c39e2d15e9 100644
--- a/apps/web/app/environments/[environmentId]/integrations/alerts/slack/AddSlackAlertModal.tsx
+++ b/apps/web/app/environments/[environmentId]/integrations/alerts/slack/AddSlackAlertModal.tsx
@@ -19,10 +19,10 @@ const AddEmailAlertModal: React.FC<AddEmailAlertModalProps> = ({ open, setOpen }
   ];
 
   const onTest = () => {
-    console.log("Test button clicked!");
+    throw Error("not implemented");
   };
   const onSave = () => {
-    console.log("Save button clicked!");
+    throw Error("not implemented");
   };
 
   return (
diff --git a/apps/web/app/environments/[environmentId]/settings/api-keys/ApiKeyList.tsx b/apps/web/app/environments/[environmentId]/settings/api-keys/ApiKeyList.tsx
index a72728efff..9b32937582 100644
--- a/apps/web/app/environments/[environmentId]/settings/api-keys/ApiKeyList.tsx
+++ b/apps/web/app/environments/[environmentId]/settings/api-keys/ApiKeyList.tsx
@@ -33,7 +33,5 @@ export default function ApiKeyList({
 
   const environmentTypeId = findEnvironmentByType(product?.environments, environmentType);
 
-  console.log(environmentTypeId);
-
   return <EditApiKeys environmentTypeId={environmentTypeId} environmentType={environmentType} />;
 }