diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index e2726b79..08c9fda2 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -270,6 +270,7 @@
     "pending": "Pending",
     "no_pending_invites": "You have no pending invites",
     "no_blocked_users": "You have no blocked users",
-    "friend_code_copied": "Friend code copied"
+    "friend_code_copied": "Friend code copied",
+    "undo_friendship_modal_text": "This will undo your friendship with {{displayName}}"
   }
 }
diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
index 36d38c96..a97a81cf 100644
--- a/src/locales/pt/translation.json
+++ b/src/locales/pt/translation.json
@@ -273,6 +273,7 @@
     "pending": "Pendentes",
     "no_pending_invites": "Você não possui convites de amizade pendentes",
     "no_blocked_users": "Você não tem nenhum usuário bloqueado",
-    "friend_code_copied": "Código de amigo copiado"
+    "friend_code_copied": "Código de amigo copiado",
+    "undo_friendship_modal_text": "Isso irá remover sua amizade com {{displayName}}"
   }
 }
diff --git a/src/renderer/src/pages/user/user-confirm-undo-friendship-modal.tsx b/src/renderer/src/pages/user/user-confirm-undo-friendship-modal.tsx
new file mode 100644
index 00000000..cf2a0415
--- /dev/null
+++ b/src/renderer/src/pages/user/user-confirm-undo-friendship-modal.tsx
@@ -0,0 +1,42 @@
+import { Button, Modal } from "@renderer/components";
+import * as styles from "./user.css";
+import { useTranslation } from "react-i18next";
+
+export interface UserConfirmUndoFriendshipModalProps {
+  visible: boolean;
+  displayName: string;
+  onConfirm: () => void;
+  onClose: () => void;
+}
+
+export const UserConfirmUndoFriendshipModal = ({
+  visible,
+  displayName,
+  onConfirm,
+  onClose,
+}: UserConfirmUndoFriendshipModalProps) => {
+  const { t } = useTranslation("user_profile");
+
+  return (
+    <>
+      <Modal
+        visible={visible}
+        title={t("sign_out_modal_title")}
+        onClose={onClose}
+      >
+        <div className={styles.signOutModalContent}>
+          <p>{t("undo_friendship_modal_text", { displayName })}</p>
+          <div className={styles.signOutModalButtonsContainer}>
+            <Button onClick={onConfirm} theme="danger">
+              {t("undo_friendship")}
+            </Button>
+
+            <Button onClick={onClose} theme="primary">
+              {t("cancel")}
+            </Button>
+          </div>
+        </div>
+      </Modal>
+    </>
+  );
+};
diff --git a/src/renderer/src/pages/user/user-content.tsx b/src/renderer/src/pages/user/user-content.tsx
index c334389e..fb092d06 100644
--- a/src/renderer/src/pages/user/user-content.tsx
+++ b/src/renderer/src/pages/user/user-content.tsx
@@ -34,6 +34,7 @@ import { UserProfileSettingsModal } from "./user-profile-settings-modal";
 import { UserSignOutModal } from "./user-sign-out-modal";
 import { UserFriendModalTab } from "../shared-modals/user-friend-modal";
 import { UserBlockModal } from "./user-block-modal";
+import { UserConfirmUndoFriendshipModal } from "./user-confirm-undo-friendship-modal";
 
 const MAX_MINUTES_TO_SHOW_IN_PLAYTIME = 120;
 
@@ -68,6 +69,7 @@ export function UserContent({
     useState(false);
   const [showSignOutModal, setShowSignOutModal] = useState(false);
   const [showUserBlockModal, setShowUserBlockModal] = useState(false);
+  const [showUndoFriendshipModal, setShowUndoFriendshipModal] = useState(false);
   const [currentGame, setCurrentGame] = useState<GameRunning | null>(null);
 
   const { gameRunning } = useAppSelector((state) => state.gameRunning);
@@ -213,17 +215,12 @@ export function UserContent({
     }
 
     if (userProfile.relation.status === "ACCEPTED") {
-      const userId =
-        userProfile.relation.AId === userDetails?.id
-          ? userProfile.relation.BId
-          : userProfile.relation.AId;
-
       return (
         <>
           <Button
             theme="outline"
             className={styles.cancelRequestButton}
-            onClick={() => handleFriendAction(userId, "UNDO")}
+            onClick={() => setShowUndoFriendshipModal(true)}
           >
             <XCircleIcon size={28} /> {t("undo_friendship")}
           </Button>
@@ -291,6 +288,13 @@ export function UserContent({
         displayName={userProfile.displayName}
       />
 
+      <UserConfirmUndoFriendshipModal
+        visible={showUndoFriendshipModal}
+        onClose={() => setShowUndoFriendshipModal(false)}
+        onConfirm={() => handleFriendAction(userProfile.id, "UNDO")}
+        displayName={userProfile.displayName}
+      />
+
       <section
         className={styles.profileContentBox}
         style={{