diff --git a/bazaar/core/mobsf.py b/bazaar/core/mobsf.py
index f352f6c..0dde62c 100644
--- a/bazaar/core/mobsf.py
+++ b/bazaar/core/mobsf.py
@@ -49,15 +49,10 @@ def scan(self, data):
         """
         logger.debug(f"Requesting {self.__server} to scan {data['hash']}")
         headers = {'Authorization': self.__apikey}
-        max_attempts = 100
-        for attempt in range(max_attempts):
-            try:
-                r = requests.post(f'{self.__server}/api/v1/scan', data=data, headers=headers, timeout=10)
-                break
-            except (requests.ConnectionError, requests.Timeout, requests.ReadTimeout):
-                if attempt == max_attempts - 1:
-                    raise
-                time.sleep(5)
+        try:
+            r = requests.post(f'{self.__server}/api/v1/scan', data=data, headers=headers, timeout=10)
+        except Exception:
+            return None
         return r.json()
 
     def scans(self, page=1, page_size=100):
@@ -78,8 +73,8 @@ def report_json(self, data):
         headers = {'Authorization': self.__apikey}
         data = {'hash': data['hash']}
         r = requests.post(f'{self.__server}/api/v1/report_json', data=data, headers=headers, timeout=10)
-        while r.status_code != 200:
-            time.sleep(3)
+        while r.status_code == 404:
+            time.sleep(10)
             r = requests.post(f'{self.__server}/api/v1/report_json', data=data, headers=headers, timeout=10)
         return r.json()