diff --git a/app/assets/javascripts/discourse/components/topic-status-info.js.es6 b/app/assets/javascripts/discourse/components/topic-status-info.js.es6
index 86bf0800696..e204db09a7c 100644
--- a/app/assets/javascripts/discourse/components/topic-status-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status-info.js.es6
@@ -12,7 +12,7 @@ export default Ember.Component.extend(bufferedRender({
   ],
 
   buildBuffer(buffer) {
-    if (!this.get('topic.topic_status_update')) return;
+    if (!this.get('topic.topic_status_update.execute_at')) return;
 
     let statusUpdateAt = moment(this.get('topic.topic_status_update.execute_at'));
     if (statusUpdateAt < new Date()) return;