diff --git a/go/vt/discovery/topology_watcher.go b/go/vt/discovery/topology_watcher.go
index a09ded0052a..64346d524ad 100644
--- a/go/vt/discovery/topology_watcher.go
+++ b/go/vt/discovery/topology_watcher.go
@@ -406,7 +406,8 @@ func NewFilterByTabletTags(tabletTags map[string]string) *FilterByTabletTags {
 func (fbtg *FilterByTabletTags) IsIncluded(tablet *topodata.Tablet) bool {
 	if fbtg.tags == nil {
 		return true
-	} else if tablet.Tags == nil {
+	}
+	if tablet.Tags == nil {
 		return false
 	}
 	for key, val := range fbtg.tags {