diff --git a/plugins/common/functions b/plugins/common/functions
index 2952ee25d..32d8ad9ac 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -1065,7 +1065,7 @@ strip_inline_comments() {
 
 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])*)\.)*[a-z0-9\*](-?[a-z0-9])+\.[a-z]{2,}$'
+  local hostname_string="${1,,}"; 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 43c571d4e..4cd358825 100644
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -37,6 +37,10 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+  run dokku domains:add $TEST_APP a--domain.with--hyphens
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
 }
 
 @test "(domains) domains:add (multiple)" {