diff --git a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.component.js b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.component.js
index 6cce3cefa5..417c4ccb13 100644
--- a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.component.js
+++ b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.component.js
@@ -22,7 +22,6 @@ class ScopeSelectorClass extends Component<Props, State> {
         super(props);
 
         this.state = {
-            openOrgUnitWarning: false,
             openProgramWarning: null,
             openCatComboWarning: false,
             openStartAgainWarning: false,
@@ -32,14 +31,6 @@ class ScopeSelectorClass extends Component<Props, State> {
 
     dontShowWarning = () => !this.props.isUserInteractionInProgress;
 
-    handleOpenOrgUnitWarning = () => {
-        if (this.dontShowWarning()) {
-            this.props.onResetOrgUnitId();
-            return;
-        }
-        this.setState({ openOrgUnitWarning: true });
-    }
-
     handleOpenProgramWarning = (baseAction: ReduxAction<any, any>) => {
         if (this.dontShowWarning()) {
             this.props.onResetProgramId(baseAction);
@@ -66,18 +57,12 @@ class ScopeSelectorClass extends Component<Props, State> {
 
     handleClose = () => {
         this.setState({
-            openOrgUnitWarning: false,
             openProgramWarning: null,
             openCatComboWarning: false,
             openStartAgainWarning: false,
         });
     }
 
-    handleAcceptOrgUnit = () => {
-        this.props.onResetOrgUnitId();
-        this.handleClose();
-    }
-
     handleAcceptProgram = () => {
         if (this.state.openProgramWarning) {
             this.props.onResetProgramId(this.state.openProgramWarning);
@@ -96,7 +81,12 @@ class ScopeSelectorClass extends Component<Props, State> {
     }
 
     render() {
-        const { onSetOrgUnit, onSetProgramId, onSetCategoryOption, onResetAllCategoryOptions } = this.props;
+        const {
+            onSetOrgUnit,
+            onSetProgramId,
+            onSetCategoryOption,
+            onResetAllCategoryOptions,
+        } = this.props;
 
         return (
             <div
@@ -108,7 +98,7 @@ class ScopeSelectorClass extends Component<Props, State> {
                     onSetProgramId={onSetProgramId}
                     onSetCategoryOption={onSetCategoryOption}
                     onResetAllCategoryOptions={onResetAllCategoryOptions}
-                    onResetOrgUnitId={this.handleOpenOrgUnitWarning}
+                    onResetOrgUnitId={this.props.onResetOrgUnitId}
                     onResetProgramId={this.handleOpenProgramWarning}
                     onResetCategoryOption={this.handleOpenCatComboWarning}
                     onStartAgain={this.handleStartAgainWarning}
@@ -122,12 +112,6 @@ class ScopeSelectorClass extends Component<Props, State> {
                 >
                     {this.props.children}
                 </QuickSelector>
-                <DiscardDialog
-                    onDestroy={this.handleAcceptOrgUnit}
-                    open={this.state.openOrgUnitWarning}
-                    onCancel={this.handleClose}
-                    {...defaultDialogProps}
-                />
                 <DiscardDialog
                     onDestroy={this.handleAcceptProgram}
                     open={!!this.state.openProgramWarning}
diff --git a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js
index 6199295503..dd32042503 100644
--- a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js
+++ b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.container.js
@@ -6,7 +6,6 @@ import type { OwnProps } from './ScopeSelector.types';
 import { useOrgUnitNameWithAncestors } from '../../metadataRetrieval/orgUnitName';
 import { resetOrgUnitIdFromScopeSelector } from './ScopeSelector.actions';
 
-
 const deriveReadiness = (lockedSelectorLoads, selectedOrgUnitId, selectedOrgUnitName, displayName, ouNameError) => {
     // because we want the orgUnit to be fetched and stored
     // before allowing the user to view the locked selector
diff --git a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.types.js b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.types.js
index 09faa0ece8..c802a05dc1 100644
--- a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.types.js
+++ b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.types.js
@@ -34,7 +34,6 @@ export type Props = {|
 |}
 
 export type State = {|
-  openOrgUnitWarning: boolean;
   openProgramWarning: ?Object;
   openCatComboWarning: boolean;
   openStartAgainWarning: boolean;
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
index 21b2e372ea..809ac15002 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -69,7 +69,7 @@ const styles = {
     tooltip: { display: 'inline-flex' },
 };
 
-export const WidgetEventEditPlain = ({
+const WidgetEventEditPlain = ({
     eventStatus,
     initialScheduleDate,
     stage,
@@ -93,11 +93,13 @@ export const WidgetEventEditPlain = ({
 
     const supportsChangelog = useFeature(FEATURES.changelogs);
     const { currentPageMode } = useEnrollmentEditEventPageMode(eventStatus);
-    const { orgUnit, error } = useCoreOrgUnit(orgUnitId);
     const [changeLogIsOpen, setChangeLogIsOpen] = useState(false);
     // "Edit event"-button depends on loadedValues. Delay rendering component until loadedValues has been initialized.
     const loadedValues = useSelector(({ viewEventPage }) => viewEventPage.loadedValues);
 
+    const { orgUnit: coreOrgUnit, error } = useCoreOrgUnit(orgUnitId);
+    const orgUnit = coreOrgUnit || loadedValues?.orgUnit;
+
     const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, programId);
     if (error) {
         return error.errorComponent;