diff --git a/conversejs/custom/plugins/poll/components/poll-view.js b/conversejs/custom/plugins/poll/components/poll-view.js
index 53d7e939..8742f044 100644
--- a/conversejs/custom/plugins/poll/components/poll-view.js
+++ b/conversejs/custom/plugins/poll/components/poll-view.js
@@ -53,6 +53,11 @@ export default class MUCPollView extends CustomElement {
       body: '!' + choice.choice
     })
   }
+
+  closePoll (ev) {
+    ev.preventDefault()
+    this.model.set('current_poll', undefined)
+  }
 }
 
 api.elements.define('livechat-converse-muc-poll', MUCPollView)
diff --git a/conversejs/custom/plugins/poll/index.js b/conversejs/custom/plugins/poll/index.js
index adf72ca7..b87f804c 100644
--- a/conversejs/custom/plugins/poll/index.js
+++ b/conversejs/custom/plugins/poll/index.js
@@ -71,7 +71,7 @@ converse.plugins.add('livechat-converse-poll', {
           return this.__super__.onMessage(attrs)
         }
         // We intercept poll messages, to show the banner.
-        // Note: we also show the message in the chat.
+        // Note: we also show poll end messages in the chat, so that the user don't loose the result.
         if (attrs.is_delayed || attrs.is_archived) {
           if (attrs.current_poll.over) {
             console.info('Got a delayed/archived poll message for an poll that is over, just displaying in the chat')
diff --git a/conversejs/custom/plugins/poll/styles/poll.scss b/conversejs/custom/plugins/poll/styles/poll.scss
index ca5476ec..81ac2dd8 100644
--- a/conversejs/custom/plugins/poll/styles/poll.scss
+++ b/conversejs/custom/plugins/poll/styles/poll.scss
@@ -23,6 +23,12 @@
         padding-right: 0.25em;
       }
 
+      .livechat-poll-close {
+        background: unset;
+        border: 0;
+        float: right;
+      }
+
       p.livechat-poll-question {
         text-align: center;
         font-weight: bold;
diff --git a/conversejs/custom/plugins/poll/templates/poll.js b/conversejs/custom/plugins/poll/templates/poll.js
index 703cb114..e4367126 100644
--- a/conversejs/custom/plugins/poll/templates/poll.js
+++ b/conversejs/custom/plugins/poll/templates/poll.js
@@ -82,6 +82,12 @@ export function tplPoll (el, currentPoll) {
 
   return html`<div class="${currentPoll.over ? 'livechat-poll-over' : ''}">
     <p class="livechat-poll-question">
+      ${currentPoll.over
+        ? html`<button class="livechat-poll-close" @click=${el.closePoll} title="${__('Close')}">
+            <converse-icon class="fa fa-times" size="1em"></converse-icon>
+          </button>`
+        : ''
+      }
       ${el.collapsed
         ? html`
           <button @click=${el.toggle} class="livechat-poll-toggle">
diff --git a/prosody-modules/mod_muc_poll/message.lib.lua b/prosody-modules/mod_muc_poll/message.lib.lua
index ce282328..ea17b88a 100644
--- a/prosody-modules/mod_muc_poll/message.lib.lua
+++ b/prosody-modules/mod_muc_poll/message.lib.lua
@@ -157,6 +157,11 @@ local function poll_end_message(room)
     return nil;
   end
   module:log("debug", "Sending the end message for room %s poll", room.jid);
+  if scheduled_updates[room.jid] then
+    module:log("debug", "Cancelling an update message for the poll %s", room.jid);
+    timer.stop(scheduled_updates[room.jid]);
+    scheduled_updates[room.jid] = nil;
+  end
   local message_id = id.medium(); -- generate a new id
   local msg = build_poll_message(room, message_id, true);
   room:broadcast_message(msg);
diff --git a/prosody-modules/mod_muc_poll/poll.lib.lua b/prosody-modules/mod_muc_poll/poll.lib.lua
index 73c16b00..973b02b7 100644
--- a/prosody-modules/mod_muc_poll/poll.lib.lua
+++ b/prosody-modules/mod_muc_poll/poll.lib.lua
@@ -13,6 +13,7 @@ local schedule_poll_update_message = module:require("message").schedule_poll_upd
 
 local string_poll_invalid_choice = module:get_option_string("poll_string_invalid_choice") or "This choice is not valid.";
 local string_poll_anonymous_vote_ok = module:get_option_string("poll_string_anonymous_vote_ok") or "You vote is taken into account. Votes are anonymous, it will not be shown to other participants.";
+local string_poll_over = module:get_option_string("poll_string_over") or "This poll is now over.";
 
 local scheduled_end = {};
 
@@ -160,7 +161,7 @@ local function handle_groupchat(event)
       "cancel",
       -- error_condition = 'not-allowed' (see RFC 6120 Defined Error Conditions https://xmpp.org/rfcs/rfc6120.html#stanzas-error-conditions)
       "not-allowed",
-      "This poll is over."
+      string_poll_over
       ));
     return true; -- stop!
   end