diff --git a/ChangeLog b/ChangeLog
index 53f649932..fc38c7c50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-18  Alex Roitman  <shura@gramps-project.org>
+	* src/DateEdit.py (DateEditorDialog.switch_calendar): Only convert
+	non-empty dates to new calendar.
+
 2007-06-17  Alex Roitman  <shura@gramps-project.org>
 	* src/plugins/Verify.py: Clarification in wording: #1071.
 	* src/GrampsCfg.py (NameFormatEditDlg.cb_format_changed): Catch
diff --git a/src/DateEdit.py b/src/DateEdit.py
index c759487f2..1b1142d77 100644
--- a/src/DateEdit.py
+++ b/src/DateEdit.py
@@ -366,7 +366,8 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
                 value=the_value,
                 text=the_text)
 
-        self.date.convert_calendar(new_cal)
+        if not self.date.is_empty():
+            self.date.convert_calendar(new_cal)
         
         self.start_month_box.get_model().clear()
         self.stop_month_box.get_model().clear()