diff --git a/bot/plugins/whois.py b/bot/plugins/whois.py
index 34c00ef..417f122 100644
--- a/bot/plugins/whois.py
+++ b/bot/plugins/whois.py
@@ -24,9 +24,9 @@ class WhoisPlugin(Plugin):
 
     async def execute(self, function_name, **kwargs) -> Dict:
         try:
-            whois_result = whois.whois(kwargs['domain'])
-            return whois_result
-        except whois.parser.PywhoisError as e:
-            return {'result': 'No such domain found'}
+            whois_result = whois.query(kwargs['domain'])
+            if whois_result is None:
+                return {'result': 'No such domain found'}
+            return whois_result.__dict__
         except Exception as e:
             return {'error': 'An unexpected error occurred: ' + str(e)}