diff --git a/plugins/domains/functions b/plugins/domains/functions
index 7b36473ef..3467b30b2 100755
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -312,7 +312,7 @@ is_global_vhost_enabled() {
 is_valid_hostname() {
   declare desc="return 0 if argument is a valid hostname; else return 1"
   local hostname_string="${1,,}"
-  local hostname_regex='^([a-z0-9\*-]+\.)*[a-z0-9\*-]+$'
+  local hostname_regex='^([a-z0-9\.\*-]+\.)*[a-z0-9\*-]+$'
   if [[ $hostname_string =~ $hostname_regex ]]; then
     return 0
   else
diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats
index 5aa104750..f23aac2b1 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -45,6 +45,11 @@ teardown() {
   echo "status: $status"
   assert_success
 
+  run /bin/bash -c "dokku domains:add $TEST_APP .dokku.me"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
   run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
   echo "output: $output"
   echo "status: $status"