diff --git a/app/src/app/Mapping/Modal/MappingCommentModal.tsx b/app/src/app/Mapping/Modal/MappingCommentModal.tsx
index d8c9d58..878fdc2 100644
--- a/app/src/app/Mapping/Modal/MappingCommentModal.tsx
+++ b/app/src/app/Mapping/Modal/MappingCommentModal.tsx
@@ -43,7 +43,10 @@ export const MappingCommentModal: React.FunctionComponent<MappingCommentModalPro
     setModalShowState(new_state)
     setIsModalOpen(new_state)
     if (!new_state) {
+      // Closing the modal
       setMessageValue('')
+      setCommentToEdit({})
+      setComments([])
     }
   }