diff --git a/src/Socialbox/Classes/ServerResolver.php b/src/Socialbox/Classes/ServerResolver.php
index 29d25a1..3e3e8d6 100644
--- a/src/Socialbox/Classes/ServerResolver.php
+++ b/src/Socialbox/Classes/ServerResolver.php
@@ -19,19 +19,18 @@ class ServerResolver
      * @throws ResolutionException If the DNS TXT records cannot be resolved or if required information is missing.
      * @throws DatabaseOperationException
      */
-    public static function resolveDomain(string $domain): ResolvedServer
+    public static function resolveDomain(string $domain, bool $useDatabase=true): ResolvedServer
     {
         // First query the database to check if the domain is already resolved
-        if(ResolvedServersManager::resolvedServerExists($domain))
+        if($useDatabase)
         {
-            // If the resolved server was updated in the last 30 minutes, return it
-            if(ResolvedServersManager::getResolvedServerUpdated($domain) > (time() - 1800))
+            $resolvedServer = ResolvedServersManager::getResolvedServer($domain);
+            if($resolvedServer !== null)
             {
-                return ResolvedServersManager::getResolvedServer($domain)->toResolvedServer();
+                return $resolvedServer->toResolvedServer();
             }
         }
 
-
         $txtRecords = self::dnsGetTxtRecords($domain);
         if ($txtRecords === false)
         {