diff --git a/Framework/deploy_handler/long_poll_handler.py b/Framework/deploy_handler/long_poll_handler.py
index 1a6de8c6..7acc5e91 100644
--- a/Framework/deploy_handler/long_poll_handler.py
+++ b/Framework/deploy_handler/long_poll_handler.py
@@ -1,6 +1,6 @@
 # Author: sazid
 
-from typing import Any, Callable
+from typing import Any, Callable, Coroutine
 import traceback
 import asyncio
 import random
@@ -9,7 +9,6 @@
 from colorama import Fore
 from pathlib import Path
 from urllib.parse import urlparse
-import requests
 
 from Framework.Utilities import RequestFormatter, ConfigModule, CommonUtil
 from Framework.Utilities.RequestFormatter import REQUEST_TIMEOUT
@@ -30,7 +29,7 @@ class DeployHandler:
 
     def __init__(
         self,
-        on_connect_callback: Callable[[bool], None],
+        on_connect_callback: Callable[[bool], Coroutine[Any, Any, None]],
         response_callback: Callable[[Any], None],
         cancel_callback: Callable[[], None],
         done_callback: Callable[[], bool],
@@ -261,9 +260,8 @@ async def run(self, host: str) -> None:
             if reconnect:
                 await asyncio.sleep(random.randint(1, 3))
 
-            await self.on_connect_callback(reconnect)
-
             try:
+                await self.on_connect_callback(reconnect)
                 reconnect = True
                 resp = await RequestFormatter.async_request("get", host, timeout=70)
                 if resp is None:
@@ -303,19 +301,6 @@ async def run(self, host: str) -> None:
                     break
 
                 reconnect = False
-            except (
-                requests.exceptions.ConnectTimeout,
-                requests.exceptions.ReadTimeout,
-                requests.exceptions.ConnectionError,
-            ) as e:
-                # Nginx down, VM down, network issue, docker-compose stopped
-                if STATE.reconnect_with_credentials is not None:
-                    return None
-                print_online = True
-                print(e)
-                print(Fore.YELLOW + "Retrying after 30s")
-                await asyncio.sleep(30)
-
             except Exception as e:
                 if STATE.reconnect_with_credentials is not None:
                     return None