diff --git a/etemplate/js/et2_widget_date.js b/etemplate/js/et2_widget_date.js
index 9768d90947..a0b887cd9f 100644
--- a/etemplate/js/et2_widget_date.js
+++ b/etemplate/js/et2_widget_date.js
@@ -104,7 +104,7 @@ var et2_date = et2_inputWidget.extend(
 				d.setHours(inst.hour);
 				d.setMinutes(inst.minute);
 			}
-			else if(inst && (typeof inst.hour === 'undefined'))
+			else if(inst && (typeof inst.hour === 'undefined') && (typeof inst.settings.timepicker !== 'undefined'))
 			{
 				d.setHours(inst.settings.timepicker.hour);
 				d.setMinutes(inst.settings.timepicker.minute);