diff -r cefe52608b67 javafx-ui-charts/src/javafx/scene/chart/XYChart.java
--- a/javafx-ui-charts/src/javafx/scene/chart/XYChart.java	Tue Jul 10 20:22:00 2012 -0400
+++ b/javafx-ui-charts/src/javafx/scene/chart/XYChart.java	Wed Jul 11 14:23:31 2012 -0700
@@ -169,8 +169,9 @@
             if(old != null) {
                 old.removeListener(seriesChanged);
                 // Set animated to false so we don't animate both remove and add
-                // at the same time. RT-14163
-                if (old.size() > 0) {
+                // at the same time. RT-14163 
+                // RT-21295 - disable animated only when current is also not null. 
+                if (current != null && old.size() > 0) {
                     saveAnimationState = (old.get(0).getChart().getAnimated()) ? 1 : 2;
                     old.get(0).getChart().setAnimated(false);
                 }