diff --git a/apps/comments-ui/src/components/content/context-menus/comment-context-menu.tsx b/apps/comments-ui/src/components/content/context-menus/comment-context-menu.tsx
index a5d565c56b9..48243240fd7 100644
--- a/apps/comments-ui/src/components/content/context-menus/comment-context-menu.tsx
+++ b/apps/comments-ui/src/components/content/context-menus/comment-context-menu.tsx
@@ -38,9 +38,9 @@ const CommentContextMenu: React.FC<Props> = ({comment, close, toggleEdit}) => {
         }
 
         return () => {
-            window.removeEventListener('click', listener, {passive: true} as any);
+            window.removeEventListener('click', listener);
             if (el && el !== window) {
-                el.removeEventListener('click', listener, {passive: true} as any);
+                el.removeEventListener('click', listener);
             }
         };
     }, [close]);
@@ -56,7 +56,7 @@ const CommentContextMenu: React.FC<Props> = ({comment, close, toggleEdit}) => {
         window.addEventListener('keydown', listener, {passive: true});
 
         return () => {
-            window.removeEventListener('keydown', listener, {passive: true} as any);
+            window.removeEventListener('keydown', listener);
         };
     }, [close]);
 
diff --git a/apps/comments-ui/src/components/content/forms/form.tsx b/apps/comments-ui/src/components/content/forms/form.tsx
index 92291a4e46d..cee6fbca752 100644
--- a/apps/comments-ui/src/components/content/forms/form.tsx
+++ b/apps/comments-ui/src/components/content/forms/form.tsx
@@ -125,7 +125,7 @@ export const FormEditor: React.FC<FormEditorProps> = ({comment, submit, progress
         window.addEventListener('keydown', keyDownListener, {passive: true});
 
         return () => {
-            window.removeEventListener('keydown', keyDownListener, {passive: true} as any);
+            window.removeEventListener('keydown', keyDownListener);
         };
     }, [editor, close, submitForm]);
 
diff --git a/apps/comments-ui/src/components/content/forms/main-form.tsx b/apps/comments-ui/src/components/content/forms/main-form.tsx
index bb7e2c55321..92b3a752dc5 100644
--- a/apps/comments-ui/src/components/content/forms/main-form.tsx
+++ b/apps/comments-ui/src/components/content/forms/main-form.tsx
@@ -77,7 +77,7 @@ const MainForm: React.FC<Props> = ({commentsCount}) => {
         window.addEventListener('keydown', keyDownListener, {passive: true});
 
         return () => {
-            window.removeEventListener('keydown', keyDownListener, {passive: true} as any);
+            window.removeEventListener('keydown', keyDownListener);
         };
     }, [editor]);
 
diff --git a/apps/comments-ui/src/components/content/forms/sorting-form.tsx b/apps/comments-ui/src/components/content/forms/sorting-form.tsx
index 88b86dcfa4e..1bb9bee0221 100644
--- a/apps/comments-ui/src/components/content/forms/sorting-form.tsx
+++ b/apps/comments-ui/src/components/content/forms/sorting-form.tsx
@@ -41,9 +41,9 @@ export const SortingForm: React.FC = () => {
         }
 
         return () => {
-            window.removeEventListener('click', listener, {passive: true} as any);
+            window.removeEventListener('click', listener);
             if (el && el !== window) {
-                el.removeEventListener('click', listener, {passive: true} as any);
+                el.removeEventListener('click', listener);
             }
         };
     }, []);
diff --git a/apps/comments-ui/src/components/popups/generic-popup.tsx b/apps/comments-ui/src/components/popups/generic-popup.tsx
index f9f5d2f9ed4..5ae98a2ebd0 100644
--- a/apps/comments-ui/src/components/popups/generic-popup.tsx
+++ b/apps/comments-ui/src/components/popups/generic-popup.tsx
@@ -29,7 +29,7 @@ const GenericPopup: React.FC<Props> = ({show, children, title, callback}) => {
         window.addEventListener('keydown', listener, {passive: true});
 
         return () => {
-            window.removeEventListener('keydown', listener, {passive: true} as any);
+            window.removeEventListener('keydown', listener);
         };
     });