diff --git a/client/src/components/BuddyMatcher.jsx b/client/src/components/BuddyMatcher.jsx
index 3a05dd74..b147d832 100644
--- a/client/src/components/BuddyMatcher.jsx
+++ b/client/src/components/BuddyMatcher.jsx
@@ -8,6 +8,7 @@ import { useChat } from 'src/context/ChatContext';
 import { useNavigate } from 'react-router-dom';
 import { useNotification } from 'src/lib/notification';
 
+const stoppingSearchLoadingText = <p>Stopping the search</p>;
 const BuddyMatcher = () => {
     const { playNotification } = useNotification();
     const navigate = useNavigate();
@@ -16,6 +17,7 @@ const BuddyMatcher = () => {
 
     // eslint-disable-next-line no-unused-vars
     const [isFound, setIsFound] = useState(false);
+    const [isStoppingSearch, setIsStoppingSearch] = useState(false);
     const socket = useContext(SocketContext);
 
     const userID = auth.loginId;
@@ -29,6 +31,15 @@ const BuddyMatcher = () => {
         socket.emit('join', { loginId: auth.loginId, email: auth.email });
     };
 
+    const handleStopSearch = () => {
+        socket.emit('stop_search', { loginId: auth.loginId, email: auth.email });
+        setIsStoppingSearch(true);
+    };
+
+    useEffect(() => {
+        setLoadingText(isStoppingSearch ? stoppingSearchLoadingText : defaultLoadingText);
+    }, [isStoppingSearch]);
+
     useEffect(() => {
         if (loadingText === defaultLoadingText) {
             timeout = setTimeout(() => {
@@ -119,6 +130,11 @@ const BuddyMatcher = () => {
             setIsFound(false);
         });
 
+        socket.on('stop_search_success', () => {
+            setIsStoppingSearch(false);
+            navigate('/');
+        });
+
         return () => {
             socket
                 .off('connect')
@@ -136,6 +152,14 @@ const BuddyMatcher = () => {
         <div className="flex w-full justify-center items-center min-h-[86.5vh] flex-col bg-primary">
             <ThreeDots fill="rgb(255 159 28)" />
             <div className="text-lg text-center text-white">{loadingText}</div>
+            {!isStoppingSearch && <button
+                onClick={handleStopSearch}
+                className={
+                    'hover:no-underline hover:text-white font-medium text-white text-[1.5em] w-[8em] h-[2.3em] mt-4 rounded-[30px] bg-[#FF3A46] flex flex-col items-center justify-center'
+                }
+            >
+                Stop
+            </button>}
         </div>
     );
 };
diff --git a/server/index.js b/server/index.js
index e33c58e6..ced4f40b 100644
--- a/server/index.js
+++ b/server/index.js
@@ -327,6 +327,11 @@ io.on('connection', (socket) => {
             socket.broadcast.to(emailOrLoginId).emit('inactive');
         });
     });
+
+    socket.on('stop_search', async ({ loginId, email }) => {
+        await delWaitingUser(email ?? loginId);
+        socket.emit('stop_search_success');
+    });
 });
 
 app.use(cors());