diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/VisualizerContext.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/VisualizerContext.java
index <HASH>..<HASH> 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/VisualizerContext.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/VisualizerContext.java
@@ -156,7 +156,7 @@ public class VisualizerContext extends AnyMap<String> {
    */
   public Clustering<Model> getOrCreateDefaultClustering() {
     Clustering<Model> c = getGenerics(CLUSTERING, Clustering.class);
-    if(c == null) {
+    if(c == null || c.getAllClusters().size() <= 0) {
       c = getGenerics(CLUSTERING_FALLBACK, Clustering.class);
     }
     if(c == null) {
Make more robust by doing more fallback to label clustering...