Index: trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java	(revision 14561)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java	(revision 14562)
@@ -362,4 +362,8 @@
     }
 
+    protected boolean redoTreeIsEmpty() {
+        return redoTree.getRowCount() == 0;
+    }
+
     @Override
     public void cleaned(CommandQueueCleanedEvent e) {
@@ -374,4 +378,7 @@
             undoRoot.add(getNodeForCommand(e.getCommand()));
             undoTreeModel.nodeStructureChanged(undoRoot);
+            // fix 16911: make sure that redo tree is rebuild with empty list
+            if (!redoTreeIsEmpty())
+                buildRedoTree();
             ensureTreesConsistency();
         }