diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index a2064153..7b366bc0 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -55,7 +55,10 @@ namespace Microsoft.Windows.Controls
         {
             _dateTimeParser.Format = GetFormatString(newValue);
             InitializeDateTimeInfoListAndParseValue();
-            Text = ConvertValueToText();
+
+            //I forgot why I set the text here. I believe it had to deal with databinding to the format. Either way we need to make sure there is a value before we try to set the text.
+            if (Value.HasValue)
+                Text = ConvertValueToText();
         }
 
         #endregion //Format