diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/TextInputControl.java b/modules/javafx.controls/src/main/java/javafx/scene/control/TextInputControl.java
index fa4fb538321..1187989c338 100644
--- a/modules/javafx.controls/src/main/java/javafx/scene/control/TextInputControl.java
+++ b/modules/javafx.controls/src/main/java/javafx/scene/control/TextInputControl.java
@@ -1244,7 +1244,10 @@ private void resetUndoRedoState() {
         updateUndoRedoState();
     }
 
-    private void updateUndoRedoState() {
+    private void updateUndoRedoState() {        
+        if (undoChange == null) {
+            return;
+        }
         undoable.set(undoChange != undoChangeHead);
         redoable.set(undoChange.next != null);
     }