diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
index 9b1817f7..ecb65da0 100644
--- a/pyrogram/client/client.py
+++ b/pyrogram/client/client.py
@@ -840,11 +840,17 @@ class Client(Methods, BaseClient):
             self.initialize()
             return self
 
-    def stop(self):
+    def stop(self, block: bool = True):
         """Stop the Client.
 
         This method disconnects the client from Telegram and stops the underlying tasks.
 
+        Parameters:
+            block (``bool``, *optional*):
+                Blocks the code execution until the client has been restarted. It is useful with ``block=False`` in case
+                you want to stop the own client *within* an handler in order not to cause a deadlock.
+                Defaults to True.
+
         Returns:
             :obj:`Client`: The stopped client itself.
 
@@ -864,17 +870,29 @@ class Client(Methods, BaseClient):
 
                 app.stop()
         """
-        self.terminate()
-        self.disconnect()
+        def do_it():
+            self.terminate()
+            self.disconnect()
+
+        if block:
+            do_it()
+        else:
+            Thread(target=do_it).start()
 
         return self
 
-    def restart(self):
+    def restart(self, block: bool = True):
         """Restart the Client.
 
         This method will first call :meth:`~Client.stop` and then :meth:`~Client.start` in a row in order to restart
         a client using a single method.
 
+        Parameters:
+            block (``bool``, *optional*):
+                Blocks the code execution until the client has been restarted. It is useful with ``block=False`` in case
+                you want to restart the own client *within* an handler in order not to cause a deadlock.
+                Defaults to True.
+
         Returns:
             :obj:`Client`: The restarted client itself.
 
@@ -898,8 +916,14 @@ class Client(Methods, BaseClient):
 
                 app.stop()
         """
-        self.stop()
-        self.start()
+        def do_it():
+            self.stop()
+            self.start()
+
+        if block:
+            do_it()
+        else:
+            Thread(target=do_it).start()
 
         return self