diff --git a/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js b/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js
index d5d956f29d..af18875d9d 100644
--- a/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js
+++ b/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.component.js
@@ -15,7 +15,7 @@ import { ResultsPageSizeContext } from '../../shared-contexts';
 import { navigateToEnrollmentOverview } from '../../../../actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.actions';
 import { useLocationQuery } from '../../../../utils/routing';
 import { EnrollmentRegistrationEntryWrapper } from '../EnrollmentRegistrationEntryWrapper.component';
-import { useCurrentOrgUnitInfo } from '../../../../hooks/useCurrentOrgUnitInfo';
+import { useCurrentOrgUnitId } from '../../../../hooks/useCurrentOrgUnitId';
 
 const getStyles = ({ typography }) => ({
     container: {
@@ -97,7 +97,7 @@ const RegistrationDataEntryPlain = ({
     const { resultsPageSize } = useContext(ResultsPageSizeContext);
     const { scopeType, programName, trackedEntityName } = useScopeInfo(selectedScopeId);
     const titleText = useScopeTitleText(selectedScopeId);
-    const { id: reduxOrgUnitId } = useCurrentOrgUnitInfo();
+    const currentOrgUnitId = useCurrentOrgUnitId();
 
     const handleRegistrationScopeSelection = (id) => {
         setScopeId(id);
@@ -176,7 +176,7 @@ const RegistrationDataEntryPlain = ({
                             <Grid item md sm={9} xs={9} >
                                 <EnrollmentRegistrationEntryWrapper
                                     id={dataEntryId}
-                                    orgUnitId={reduxOrgUnitId}
+                                    orgUnitId={currentOrgUnitId}
                                     teiId={teiId}
                                     selectedScopeId={selectedScopeId}
                                     onSave={onSaveWithEnrollment}
@@ -231,7 +231,7 @@ const RegistrationDataEntryPlain = ({
                                 <TeiRegistrationEntry
                                     id={dataEntryId}
                                     selectedScopeId={selectedScopeId}
-                                    orgUnitId={reduxOrgUnitId}
+                                    orgUnitId={currentOrgUnitId}
                                     saveButtonText={i18n.t('Save {{trackedEntityName}}', {
                                         trackedEntityName,
                                         interpolation: { escapeValue: false },
diff --git a/src/core_modules/capture-core/components/Pages/NewRelationship/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.component.js b/src/core_modules/capture-core/components/Pages/NewRelationship/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.component.js
index 70f6bc76a2..2f04955d2a 100644
--- a/src/core_modules/capture-core/components/Pages/NewRelationship/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.component.js
+++ b/src/core_modules/capture-core/components/Pages/NewRelationship/RegisterTei/DataEntry/TrackedEntityInstance/DataEntryTrackedEntityInstance.component.js
@@ -6,7 +6,7 @@ import { DATA_ENTRY_ID } from '../../registerTei.const';
 import teiClasses from './trackedEntityInstance.module.css';
 import { TeiRegistrationEntry } from '../../../../../DataEntries';
 import type { Props } from './dataEntryTrackedEntityInstance.types';
-import { useCurrentOrgUnitInfo } from '../../../../../../hooks/useCurrentOrgUnitInfo';
+import { useCurrentOrgUnitId } from '../../../../../../hooks/useCurrentOrgUnitId';
 
 const RelationshipTrackedEntityInstancePlain =
     ({
@@ -18,7 +18,7 @@ const RelationshipTrackedEntityInstancePlain =
         renderDuplicatesCardActions,
         ExistingUniqueValueDialogActions,
     }: Props) => {
-        const { id: orgUnitId } = useCurrentOrgUnitInfo();
+        const orgUnitId = useCurrentOrgUnitId();
         const fieldOptions = { theme, fieldLabelMediaBasedClass: teiClasses.fieldLabelMediaBased };
         const { trackedEntityType } = teiRegistrationMetadata || {};
         const trackedEntityTypeNameLC = trackedEntityType.name.toLocaleLowerCase();