diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index 709e1e51497..180c46c3623 100644
--- a/app/assets/javascripts/discourse/components/date-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker.js.es6
@@ -36,6 +36,9 @@ export default Ember.Component.extend({
 
   @on("willDestroyElement")
   _destroy() {
+    if (this._picker) {
+      this._picker.destroy();
+    }
     this._picker = null;
   },