diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/i18n.json b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/i18n.json
index 3d1e06042..065e54da5 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/i18n.json
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/i18n.json
@@ -5,7 +5,7 @@
         "successMessage": "Local unit added successfully!",
         "revertChangesSuccessMessage": "Local unit reverted successfully!",
         "failedMessage": "Failed to add local unit",
-        "revertChangesFailedMessage": "Failed to revert changes in local unit",
+        "revertChangesFailedMessage": "Failed to revert changes in the local unit",
         "updateMessage": "Local unit updated successfully!",
         "updateFailedMessage": "Failed to update local unit",
         "specialitiesAndCapacityTitle": "Specialities & Capacity",
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
index 83ac91f73..a23b924b3 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
@@ -427,7 +427,7 @@ function LocalUnitsForm(props: Props) {
 
     const readOnly = readOnlyFromProps
         || isNotDefined(localUnitDetailsResponse)
-        || localUnitDetailsResponse?.is_locked;
+        || localUnitDetailsResponse.is_locked;
 
     const {
         response: localUnitsOptions,
@@ -640,9 +640,8 @@ function LocalUnitsForm(props: Props) {
 
     return (
         <div className={styles.localUnitsForm}>
-            {!localUnitDetailsResponse?.is_locked
-                && readOnlyFromProps
-                && isNotDefined(localUnitDetailsResponse)
+            {isDefined(localUnitDetailsResponse)
+                && !readOnly
                 && isDefined(actionsContainerRef.current) && (
                 <Portal container={actionsContainerRef.current}>
                     {(environment !== 'production') && (
@@ -748,7 +747,7 @@ function LocalUnitsForm(props: Props) {
                                                 readOnly={!pristine}
                                             />
                                         )}
-                                        {localUnitDetailsResponse?.is_locked && (
+                                        {localUnitDetailsResponse.is_locked && (
                                             <Button
                                                 name={undefined}
                                                 onClick={setShowRevertChangesModalTrue}
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
index 075a43ff9..67c7ea997 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
@@ -30,6 +30,7 @@ export interface Props {
     isValidated: boolean;
     onDeleteActionSuccess: () => void;
     onValidationActionSuccess: () => void;
+    isLocked: boolean;
 }
 
 function LocalUnitsTableActions(props: Props) {
@@ -40,6 +41,7 @@ function LocalUnitsTableActions(props: Props) {
         isValidated,
         onValidationActionSuccess,
         onDeleteActionSuccess,
+        isLocked,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -120,14 +122,6 @@ function LocalUnitsTableActions(props: Props) {
                         >
                             {strings.localUnitsView}
                         </DropdownMenuItem>
-                        <DropdownMenuItem
-                            type="button"
-                            name={localUnitId}
-                            onClick={handleEditLocalUnitClick}
-                            disabled={isGuestUser}
-                        >
-                            {strings.localUnitsEdit}
-                        </DropdownMenuItem>
                         {hasDeletePermission && (
                             <DropdownMenuItem
                                 type="button"
@@ -137,6 +131,16 @@ function LocalUnitsTableActions(props: Props) {
                                 {strings.localUnitsDelete}
                             </DropdownMenuItem>
                         )}
+                        {!isLocked && (
+                            <DropdownMenuItem
+                                type="button"
+                                name={localUnitId}
+                                onClick={handleEditLocalUnitClick}
+                                disabled={isGuestUser}
+                            >
+                                {strings.localUnitsEdit}
+                            </DropdownMenuItem>
+                        )}
                     </>
                 )}
             >
@@ -153,6 +157,7 @@ function LocalUnitsTableActions(props: Props) {
                         name={localUnitId}
                         variant="tertiary"
                         onClick={handleViewLocalUnitClick}
+                        disabled={isGuestUser}
                     >
                         {strings.localUnitsView}
                     </Button>
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx
index faedefdb6..b4436fdb7 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx
@@ -130,6 +130,7 @@ function LocalUnitsTable(props: Props) {
                     countryId: item.country,
                     localUnitId: item.id,
                     isValidated: item.validated,
+                    isLocked: item.is_locked,
                     localUnitName: getFirstTruthyString(
                         item.local_branch_name,
                         item.english_branch_name,