diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt
index d939e692..69c20623 100644
--- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt
+++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt
@@ -92,7 +92,7 @@ fun AccountSettingScreen(
             cancelButtonText = stringResource(id = R.string.sign_out),
             okButtonClick = { showDialog = false },
             cancelButtonClick = { action(EntireAction.OnSignOutButtonClicked) },
-            onDismissRequest = { showDialog = false },
+            onDismissRequest = { },
         )
     }
 }
diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/BlockListScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/BlockListScreen.kt
index 419f7170..5c1534e4 100644
--- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/BlockListScreen.kt
+++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/BlockListScreen.kt
@@ -87,14 +87,14 @@ fun BlockListScreen(
             WSDialog(
                 title = stringResource(R.string.unblock_dialog_title),
                 subTitle = "",
-                okButtonText = stringResource(R.string.unblock),
-                cancelButtonText = stringResource(R.string.close),
-                okButtonClick = {
+                okButtonText = stringResource(R.string.close),
+                cancelButtonText = stringResource(R.string.unblock),
+                okButtonClick = { showDialog = false },
+                cancelButtonClick = {
                     action(EntireAction.UnBlockMessage)
                     showDialog = false
                 },
-                cancelButtonClick = { showDialog = false },
-                onDismissRequest = { showDialog = false },
+                onDismissRequest = { },
             )
         }
     }
diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt
index 1d6d2262..d18421fa 100644
--- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt
+++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt
@@ -146,7 +146,7 @@ fun RevokeConfirmScreen(
             cancelButtonClick = {
                 action(EntireAction.OnRevokeButtonClicked)
             },
-            onDismissRequest = { showDialog = false },
+            onDismissRequest = { },
         )
     }
 }
diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt
index 4121bb1a..b13d556e 100644
--- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt
+++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageEditScreen.kt
@@ -229,7 +229,7 @@ fun MessageEditScreen(
                     navigator.navigateMessageScreen(args = MessageScreenArgs(false))
                 },
                 cancelButtonClick = { exitDialog = false },
-                onDismissRequest = { exitDialog = false },
+                onDismissRequest = { },
             )
         }
 
@@ -241,7 +241,7 @@ fun MessageEditScreen(
                 cancelButtonText = stringResource(R.string.cancel),
                 okButtonClick = { action(SendAction.OnSendButtonClicked) },
                 cancelButtonClick = { reserveDialog = false },
-                onDismissRequest = { reserveDialog = false },
+                onDismissRequest = { },
             )
         }
 
@@ -255,7 +255,7 @@ fun MessageEditScreen(
                     navigator.navigateMessageScreen(args = MessageScreenArgs(false))
                 },
                 cancelButtonClick = { timeoutDialog = false },
-                onDismissRequest = { timeoutDialog = false },
+                onDismissRequest = { },
             )
         }
     }
diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt
index 1341aa81..92e00cd5 100644
--- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt
+++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/MessageWriteScreen.kt
@@ -176,7 +176,7 @@ fun MessageWriteScreen(
                 navigator.navigateMessageScreen(args = MessageScreenArgs(false))
             },
             cancelButtonClick = { dialogState = false },
-            onDismissRequest = { dialogState = false },
+            onDismissRequest = { },
         )
     }
 
diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt
index 1c9358fc..2f22dab7 100644
--- a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt
+++ b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/send/ReceiverSelectionScreen.kt
@@ -229,7 +229,7 @@ fun ReceiverSelectionScreen(
                 navigator.navigateMessageScreen(args = MessageScreenArgs(false))
             },
             cancelButtonClick = { dialogState = false },
-            onDismissRequest = { dialogState = false },
+            onDismissRequest = { },
         )
     }