diff --git a/src/components/EventCalendar/EventCalendar.tsx b/src/components/EventCalendar/EventCalendar.tsx
index 336efd9882..4cb027647d 100644
--- a/src/components/EventCalendar/EventCalendar.tsx
+++ b/src/components/EventCalendar/EventCalendar.tsx
@@ -116,7 +116,7 @@ const Calendar: React.FC<InterfaceCalendarProps> = ({
   useEffect(() => {
     const data = filterData(eventData, orgData, userRole, userId);
     setEvents(data);
-  }, []);
+  }, [eventData, orgData, userRole, userId]);
 
   const handlePrevMonth = (): void => {
     if (currentMonth === 0) {
diff --git a/src/screens/OrganizationEvents/OrganizationEvents.tsx b/src/screens/OrganizationEvents/OrganizationEvents.tsx
index 566bda2e29..fe25bcdb6d 100644
--- a/src/screens/OrganizationEvents/OrganizationEvents.tsx
+++ b/src/screens/OrganizationEvents/OrganizationEvents.tsx
@@ -105,6 +105,7 @@ function organizationEvents(): JSX.Element {
       if (createEventData) {
         toast.success(t('eventCreated'));
         refetch();
+        hideInviteModal();
         setFormState({
           title: '',
           eventdescrip: '',