diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 52ef462dba..08ea4243f5 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -2518,7 +2518,7 @@ compute_scalar_stats(VacAttrStatsP stats,
 			{
 				/* Reached end of duplicates of this value */
 				ndistinct++;
-				if (dups_cnt > 1)
+				if (dups_cnt > 1 || samplerows <= num_mcv)
 				{
 					nmultiple++;
 					if (track_cnt < num_mcv ||