diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35539a7e..7959c994 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.6.2](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.6.1...v1.6.2) (2026-02-25)
+
 ## [1.6.1](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.6.0...v1.6.1) (2026-02-25)
 
 ## [1.6.0](https://wibugit.wibudev.com/wibu/hipmi/compare/v1.5.40...v1.6.0) (2026-02-23)
diff --git a/package.json b/package.json
index b658c910..51b8528a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hipmi",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "private": true,
   "prisma": {
     "seed": "bun prisma/seed.ts"
diff --git a/src/app_modules/waiting_room/view.tsx b/src/app_modules/waiting_room/view.tsx
index 8a9057c5..3288598c 100644
--- a/src/app_modules/waiting_room/view.tsx
+++ b/src/app_modules/waiting_room/view.tsx
@@ -25,15 +25,21 @@ export default function WaitingRoom_View({
   const [isLoadingHome, setIsLoadingHome] = useState(false);
 
   async function onClickLogout() {
-    setLoading(true);
-    const res = await fetch(`/api/auth/logout?id=${userLoginId}`, {
-      method: "GET",
-    });
+    try {
+      setLoading(true);
+      const res = await fetch(`/api/auth/logout?id=${userLoginId}`, {
+        method: "GET",
+      });
 
-    const result = await res.json();
-    if (res.status === 200) {
-      ComponentGlobal_NotifikasiBerhasil(result.message);
-      router.push("/", { scroll: false });
+      const result = await res.json();
+      if (res.status === 200) {
+        ComponentGlobal_NotifikasiBerhasil(result.message);
+        router.push("/", { scroll: false });
+      }
+    } catch (error) {
+      console.error("Error button to home", error);
+    } finally {
+      setLoading(false);
     }
   }
 
@@ -83,7 +89,8 @@ export default function WaitingRoom_View({
                   </Text>
                   <Text fw={"bold"} c={"white"} align="center">
                     Harap tunggu, Anda akan menerima pemberitahuan melalui
-                    Whatsapp setelah disetujui.
+                    Whatsapp setelah disetujui, untuk sementara anda bisa
+                    menunggu pada halaman ini atau keluar.
                   </Text>
                 </Stack>
                 {isAccess && (
@@ -110,6 +117,10 @@ export default function WaitingRoom_View({
                     Home
                   </Button>
                 )}
+
+                <Button color="red" loading={loading} onClick={onClickLogout}>
+                  Keluar
+                </Button>
               </Stack>
             )}
           </ComponentGlobal_CardStyles>
diff --git a/src/middleware.tsx b/src/middleware.tsx
index 89f659f3..a96ef4cf 100644
--- a/src/middleware.tsx
+++ b/src/middleware.tsx
@@ -65,7 +65,7 @@ export const middleware = async (req: NextRequest) => {
 
   const { pathname } = req.nextUrl;
 
-  const apiBaseUrl = new URL(req.url).origin || process.env.NEXT_PUBLIC_API_URL;
+  const apiBaseUrl = process.env.NEXT_PUBLIC_API_URL || new URL(req.url).origin;
   // Removed excessive logging that was causing high CPU usage
   // const dbUrl = process.env.DATABASE_URL;
   // console.log("DATABASE_URL >>", dbUrl);