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 417c4ccb13..a15878b2fb 100644
--- a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.component.js
+++ b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.component.js
@@ -22,6 +22,7 @@ class ScopeSelectorClass extends Component<Props, State> {
         super(props);
 
         this.state = {
+            openOrgUnitWarning: false,
             openProgramWarning: null,
             openCatComboWarning: false,
             openStartAgainWarning: false,
@@ -31,6 +32,14 @@ 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);
@@ -57,12 +66,18 @@ 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);
@@ -98,7 +113,7 @@ class ScopeSelectorClass extends Component<Props, State> {
                     onSetProgramId={onSetProgramId}
                     onSetCategoryOption={onSetCategoryOption}
                     onResetAllCategoryOptions={onResetAllCategoryOptions}
-                    onResetOrgUnitId={this.props.onResetOrgUnitId}
+                    onResetOrgUnitId={this.handleOpenOrgUnitWarning}
                     onResetProgramId={this.handleOpenProgramWarning}
                     onResetCategoryOption={this.handleOpenCatComboWarning}
                     onStartAgain={this.handleStartAgainWarning}
@@ -112,6 +127,12 @@ 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.types.js b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.types.js
index c802a05dc1..09faa0ece8 100644
--- a/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.types.js
+++ b/src/core_modules/capture-core/components/ScopeSelector/ScopeSelector.types.js
@@ -34,6 +34,7 @@ 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 809ac15002..f945306c53 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -96,7 +96,6 @@ const WidgetEventEditPlain = ({
     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;