diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6
index dc5e549a3..14a507940 100644
--- a/plugins/poll/assets/javascripts/controllers/poll.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6
@@ -1,4 +1,5 @@
 import computed from "ember-addons/ember-computed-decorators";
+import { observes } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend({
   isMultiple: Ember.computed.equal("poll.type", "multiple"),
@@ -15,6 +16,11 @@ export default Ember.Controller.extend({
   showResultsDisabled: Em.computed.equal("poll.voters", 0),
   hideResultsDisabled: Em.computed.or("isClosed", "post.topic.archived"),
 
+  @observes("post.polls")
+  _updatePoll() {
+    this.set("model", this.get("post.pollsObject")[this.get("model.name")]);
+  },
+
   @computed("model", "vote", "model.voters", "model.options", "model.status")
   poll(poll, vote) {
     if (poll) {