diff --git a/src/commands/general/calendar.ts b/src/commands/general/calendar.ts
index fdc8bce4..3c42a119 100644
--- a/src/commands/general/calendar.ts
+++ b/src/commands/general/calendar.ts
@@ -194,8 +194,13 @@ export default class extends Command {
 					filteredEvents = await filterCalendarEvents(events, filters);
 					embeds = generateCalendarEmbeds(filteredEvents, EVENTS_PER_PAGE);
 
+					selectedEvents.forEach((event) => {
+						event.selected = false;
+					});
+
 					currentPage = 0;
 					selectedEvents = [];
+					downloadPressed = false;
 					maxPage = embeds.length;
 
 					const newComponents: ActionRowBuilder<ButtonBuilder>[] = [];
@@ -337,8 +342,13 @@ export default class extends Command {
 			filteredEvents = await filterCalendarEvents(events, filters);
 			embeds = generateCalendarEmbeds(filteredEvents, EVENTS_PER_PAGE);
 
+			selectedEvents.forEach((event) => {
+				event.selected = false;
+			});
+
 			currentPage = 0;
 			selectedEvents = [];
+			downloadPressed = false;
 			maxPage = embeds.length;
 
 			const newComponents: ActionRowBuilder<ButtonBuilder>[] = [];