Handle clusteringEnabled == NO case