diff --git a/go/vt/discovery/healthcheck.go b/go/vt/discovery/healthcheck.go
index fe349b155d6..00b5f7d28a3 100644
--- a/go/vt/discovery/healthcheck.go
+++ b/go/vt/discovery/healthcheck.go
@@ -694,6 +694,11 @@ func (hc *HealthCheckImpl) GetHealthyTabletStats(target *query.Target) []*Tablet
 	var result []*TabletHealth
 	hc.mu.Lock()
 	defer hc.mu.Unlock()
+
+	if (target.TabletType == topodata.TabletType_PRIMARY) && len(hc.healthy[KeyFromTarget(target)]) > 1 {
+		log.Warningf("[BUG] GetHealthyTabletStats called for primary tablet type, but returning more than one primary tablet")
+	}
+
 	return append(result, hc.healthy[KeyFromTarget(target)]...)
 }