diff --git a/src/net/conf.go b/src/net/conf.go
index 48372e5197..eb729167f5 100644
--- a/src/net/conf.go
+++ b/src/net/conf.go
@@ -220,7 +220,7 @@ func (c *conf) hostLookupOrder(hostname string) (ret hostLookupOrder) {
 	var first string
 	for _, src := range srcs {
 		if src.source == "myhostname" {
-			if hasDot {
+			if hostname == "" || hasDot {
 				continue
 			}
 			return fallbackOrder
diff --git a/src/net/conf_test.go b/src/net/conf_test.go
index 8f39847804..ec8814b845 100644
--- a/src/net/conf_test.go
+++ b/src/net/conf_test.go
@@ -257,6 +257,7 @@ func TestConfHostLookupOrder(t *testing.T) {
 			hostTests: []nssHostTest{
 				{"x.com", hostLookupFilesDNS},
 				{"somehostname", hostLookupCgo},
+				{"", hostLookupFilesDNS}, // Issue 13623
 			},
 		},
 		{