diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index c1015256b5..9bce4054ea 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -974,8 +974,13 @@ void CServerListManager::SetRegistered ( const bool bIsRegister )
     // it is an URL of a dynamic IP address, the IP address might have
     // changed in the meanwhile.
     // Allow IPv4 only for communicating with Directories
-    const QString strNetworkAddress      = NetworkUtil::GetDirectoryAddress ( DirectoryType, strDirectoryAddress );
-    const bool    bDirectoryAddressValid = NetworkUtil().ParseNetworkAddress ( strNetworkAddress, DirectoryAddress, false );
+    // Use SRV DNS discovery for directory connections, fallback to A/AAAA if none.
+    const QString strNetworkAddress = NetworkUtil::GetDirectoryAddress ( DirectoryType, strDirectoryAddress );
+#ifndef CLIENT_NO_SRV_CONNECT
+    const bool bDirectoryAddressValid = NetworkUtil().ParseNetworkAddressWithSrvDiscovery ( strNetworkAddress, DirectoryAddress, false );
+#else
+    const bool bDirectoryAddressValid = NetworkUtil().ParseNetworkAddress ( strNetworkAddress, DirectoryAddress, false );
+#endif
 
     if ( bIsRegister )
     {