diff --git a/lookyloo/modules/urlhaus.py b/lookyloo/modules/urlhaus.py
index 3b762f2..dc43cd9 100644
--- a/lookyloo/modules/urlhaus.py
+++ b/lookyloo/modules/urlhaus.py
@@ -76,7 +76,9 @@ class URLhaus():
             return
 
         url_information = self.__url_result(url)
-        if not url_information:
+        if (not url_information
+            or ('query_status' in url_information
+                and url_information['query_status'] == 'no_results')):
             url_storage_dir.rmdir()
             return
 
diff --git a/website/web/__init__.py b/website/web/__init__.py
index 342eebd..8807f98 100644
--- a/website/web/__init__.py
+++ b/website/web/__init__.py
@@ -447,7 +447,8 @@ def modules(tree_uuid: str):
         # TODO: make a short result
         uh = modules_responses.pop('urlhaus')
         for url, results in uh['urls'].items():
-            urlhaus_short_result['urls'].append(results)
+            if results:
+                urlhaus_short_result['urls'].append(results)
 
     urlscan_to_display: Dict = {}
     if 'urlscan' in modules_responses and modules_responses.get('urlscan'):