diff --git a/lib/date_time_picker.dart b/lib/date_time_picker.dart
index 0ea0dfc..cf81104 100644
--- a/lib/date_time_picker.dart
+++ b/lib/date_time_picker.dart
@@ -669,13 +669,21 @@ class _DateTimePickerState extends FormFieldState<String> {
         }
       }
     } else {
-      _dateLabelController.clear();
-      _timeLabelController.clear();
-
-      initValues();
+      clearSelection();
     }
   }
 
+  // Clear the date/time selection.
+  void clearSelection() {
+    _dateLabelController.clear();
+    _timeLabelController.clear();
+    _effectiveController?.clear();
+
+    _sDate = "";
+    _sTime = "";
+    initValues();
+  }
+
   @override
   void dispose() {
     widget.controller?.removeListener(_handleControllerChanged);