diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index aa761a2bd8f..5bac8d63b86 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -190,7 +190,7 @@ createWidget('discourse-poll-standard-results', {
       return ordered.map((option, idx) => {
         const contents = [];
         const per = rounded[idx].toString();
-        const chosen = attrs.vote.includes(option.id);
+        const chosen = (attrs.vote || []).includes(option.id);
 
         contents.push(h('div.option',
                        h('p', [ h('span.percentage', `${per}%`), optionHtml(option) ])
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index ee81f584b11..1047dd4a755 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -83,12 +83,11 @@ test("Reply as new topic", () => {
 
     equal(
       find('.d-editor-input').val().trim(),
-      "Continuing the discussion from [Internationalization / localization](http://localhost:3000/t/internationalization-localization/280):",
+      `Continuing the discussion from [Internationalization / localization](${window.location.origin}/t/internationalization-localization/280):`,
       "it fills composer with the ring string"
     );
-
     equal(
-      find('#select2-chosen-1').text().trim(), "feature",
+      find('.category-combobox').select2('data').text, "feature",
       "it fills category selector with the right category"
     );
   });
@@ -104,7 +103,7 @@ test("Reply as new message", () => {
 
     equal(
       find('.d-editor-input').val().trim(),
-      "Continuing the discussion from [PM for testing](http://localhost:3000/t/pm-for-testing/12):",
+      `Continuing the discussion from [PM for testing](${window.location.origin}/t/pm-for-testing/12):`,
       "it fills composer with the ring string"
     );