diff --git a/src/main/groovy/io/kamax/mxisd/lookup/DnsLookupProvider.groovy b/src/main/groovy/io/kamax/mxisd/lookup/DnsLookupProvider.groovy
index ee3b8d4..90e5adb 100644
--- a/src/main/groovy/io/kamax/mxisd/lookup/DnsLookupProvider.groovy
+++ b/src/main/groovy/io/kamax/mxisd/lookup/DnsLookupProvider.groovy
@@ -66,7 +66,7 @@ class DnsLookupProvider extends RemoteIdentityServerProvider {
 
             for (SRVRecord record : records) {
                 log.info("Found SRV record: {}", record.toString())
-                String baseUrl = (record.getPort() != 80 ? "https://" : "http://") + record.getTarget().toString(true)
+                String baseUrl = "https://${record.getTarget().toString(true)}:${record.getPort()}"
                 Optional<?> answer = find(baseUrl, type, threePid)
                 if (answer.isPresent()) {
                     return answer