diff --git a/src/components/NewMessage/NewMessagePollEditor.vue b/src/components/NewMessage/NewMessagePollEditor.vue
index 9db6aebf6393..c3841b5c53f0 100644
--- a/src/components/NewMessage/NewMessagePollEditor.vue
+++ b/src/components/NewMessage/NewMessagePollEditor.vue
@@ -65,9 +65,6 @@
 			</NcCheckboxRadioSwitch>
 		</div>
 		<template #actions>
-			<NcButton type="tertiary" @click="emit('close')">
-				{{ t('spreed', 'Dismiss') }}
-			</NcButton>
 			<NcActions v-if="supportPollDrafts" force-menu>
 				<NcActionButton v-if="isModerator" :disabled="!isFilled" @click="createPollDraft">
 					<template #icon>
@@ -205,13 +202,10 @@ function fillPollForm(payload: createPollParams) {
  * Saves a poll draft for this conversation
  */
 async function createPollDraft() {
-	const poll = await pollsStore.createPollDraft({
+	await pollsStore.createPollDraft({
 		token: props.token,
 		form: pollForm,
 	})
-	if (poll) {
-		showSuccess(t('spreed', 'Poll draft has been saved'))
-	}
 }
 
 /**
diff --git a/src/stores/polls.ts b/src/stores/polls.ts
index 43801ec2d94c..be867b707a5b 100644
--- a/src/stores/polls.ts
+++ b/src/stores/polls.ts
@@ -6,7 +6,7 @@ import debounce from 'debounce'
 import { defineStore } from 'pinia'
 import Vue from 'vue'
 
-import { showError, showInfo, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs'
+import { showError, showInfo, showSuccess, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
 import {
@@ -141,8 +141,11 @@ export const usePollsStore = defineStore('polls', {
 			try {
 				const response = await createPollDraft({ token, ...form })
 				this.addPollDraft({ token, draft: response.data.ocs.data })
+
+				showSuccess(t('spreed', 'Poll draft has been saved'))
 				return response.data.ocs.data
 			} catch (error) {
+				showError(t('spreed', 'An error occurred while saving the draft'))
 				console.error(error)
 			}
 		},