From fc96d0e5f017fb1876fba7863c24ef0aa08ef743 Mon Sep 17 00:00:00 2001
From: henrikmv <henrik@devOtta.no>
Date: Thu, 16 Jan 2025 15:29:52 +0100
Subject: [PATCH] Revert "fix: review comment"

This reverts commit d4e588504a3c8eecf0249e3680e219046a4249ea.
---
 .../WidgetEventSchedule/WidgetEventSchedule.container.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js
index 09bcd84627..aefbecd9ed 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js
@@ -46,8 +46,13 @@ export const WidgetEventSchedule = ({
     const orgUnitName = getCachedOrgUnitName(initialOrgUnitId);
     const { currentUser, noteId } = useNoteDetails();
     const [scheduleDate, setScheduleDate] = useState('');
-    const [scheduledOrgUnit, setScheduledOrgUnit] = useState(
-        initialOrgUnitId && orgUnitName ? { id: initialOrgUnitId, name: orgUnitName } : undefined);
+    const [scheduledOrgUnit, setScheduledOrgUnit] = useState();
+    useEffect(() => {
+        if (initialOrgUnitId && orgUnitName) {
+            const orgUnit = { id: initialOrgUnitId, name: orgUnitName };
+            setScheduledOrgUnit(orgUnit);
+        }
+    }, [orgUnitName, initialOrgUnitId]);
     const [isFormValid, setIsFormValid] = useState(false);
     const convertFn = pipe(convertFormToClient, convertClientToServer);
     const serverScheduleDate = convertFn(scheduleDate, dataElementTypes.DATE);