diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
index b31251a91d5..035c773897c 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
@@ -7,6 +7,7 @@
           class="silence-until"
           label="admin.user.silence_duration"
           includeFarFuture=true
+          clearable=false
           input=silenceUntil}}
       </label>
     </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index 6c2e8e1636a..cd7031bb8a6 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -8,6 +8,7 @@
             class="suspend-until"
             label="admin.user.suspend_duration"
             includeFarFuture=true
+            clearable=false
             input=suspendUntil}}
         </label>
       </div>
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
index b509f19d76a..e7d1cea3b54 100644
--- a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -8,6 +8,7 @@
         input=input
         includeWeekend=includeWeekend
         includeFarFuture=includeFarFuture
+        clearable=clearable
         none="topic.auto_update_input.none"}}
   </div>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index ca3b8ea1ac2..7b6fc38d915 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -44,6 +44,7 @@
             {{future-date-input
               class="pin-until"
               includeFarFuture=true
+              clearable=true
               input=model.pinnedInCategoryUntil}}
             {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
           </p>
@@ -54,6 +55,7 @@
             {{future-date-input
               class="pin-until"
               includeFarFuture=true
+              clearable=true
               input=model.pinnedInCategoryUntil}}
             {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
           </p>
@@ -86,6 +88,7 @@
             {{future-date-input
               class="pin-until"
               includeFarFuture=true
+              clearable=true
               input=model.pinnedGloballyUntil}}
             {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
           </p>
@@ -96,6 +99,7 @@
             {{future-date-input
               class="pin-until"
               includeFarFuture=true
+              clearable=true
               input=model.pinnedGloballyUntil}}
             {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
           </p>
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
index 47c5faf5114..8115fd3d976 100644
--- a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
@@ -164,7 +164,6 @@ export default ComboBoxComponent.extend(DatetimeMixin, {
   classNames: ["future-date-input-selector"],
   isCustom: Ember.computed.equal("value", "pick_date_and_time"),
   isBasedOnLastPost: Ember.computed.equal("value", "set_based_on_last_post"),
-  clearable: true,
   rowComponent: "future-date-input-selector/future-date-input-selector-row",
   headerComponent:
     "future-date-input-selector/future-date-input-selector-header",