diff --git a/discovery/discovery.go b/discovery/discovery.go
index 59038c65f1..b6904c7331 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -84,6 +84,9 @@ func CreateEntries(addrs []string) ([]*Entry, error) {
 	}
 
 	for _, addr := range addrs {
+		if len(addr) == 0 {
+			continue
+		}
 		entry, err := NewEntry(addr)
 		if err != nil {
 			return nil, err
diff --git a/discovery/discovery_test.go b/discovery/discovery_test.go
index caf8c2f5d5..154086e3c3 100644
--- a/discovery/discovery_test.go
+++ b/discovery/discovery_test.go
@@ -43,7 +43,8 @@ func TestCreateEntries(t *testing.T) {
 	assert.Equal(t, entries, []*Entry{})
 	assert.NoError(t, err)
 
-	entries, err = CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375"})
+	entries, err = CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375", ""})
+	assert.Equal(t, len(entries), 2)
 	assert.Equal(t, entries[0].String(), "127.0.0.1:2375")
 	assert.Equal(t, entries[1].String(), "127.0.0.2:2375")
 	assert.NoError(t, err)