diff --git a/Apps/GeoDistanceApp/Address.cs b/Apps/GeoDistanceApp/Address.cs
index 31a7bb2e..aaf4c384 100644
--- a/Apps/GeoDistanceApp/Address.cs
+++ b/Apps/GeoDistanceApp/Address.cs
@@ -96,7 +96,7 @@ namespace GeoDistance
         {
             DnsQuestionRecord question = request.Question[0];
 
-            if (!question.Name.Equals(appRecordName, StringComparison.OrdinalIgnoreCase))
+            if (!question.Name.Equals(appRecordName, StringComparison.OrdinalIgnoreCase) && !appRecordName.StartsWith("*.", StringComparison.OrdinalIgnoreCase))
                 return Task.FromResult<DnsDatagram>(null);
 
             switch (question.Type)
diff --git a/Apps/GeoDistanceApp/CNAME.cs b/Apps/GeoDistanceApp/CNAME.cs
index e971c3bc..216341fc 100644
--- a/Apps/GeoDistanceApp/CNAME.cs
+++ b/Apps/GeoDistanceApp/CNAME.cs
@@ -95,7 +95,7 @@ namespace GeoDistance
         {
             DnsQuestionRecord question = request.Question[0];
 
-            if (!question.Name.Equals(appRecordName, StringComparison.OrdinalIgnoreCase))
+            if (!question.Name.Equals(appRecordName, StringComparison.OrdinalIgnoreCase) && !appRecordName.StartsWith("*.", StringComparison.OrdinalIgnoreCase))
                 return Task.FromResult<DnsDatagram>(null);
 
             Location location = null;