diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
index 9d703c0cf4..58563f440b 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
@@ -16,7 +16,7 @@ import { ComcolModule } from '../../shared/comcol/comcol.module';
 import { CollectionAccessControlComponent } from './collection-access-control/collection-access-control.component';
 import {
   AccessControlArrayFormModule
-} from '../../shared/access-control-array-form/access-control-array-form.component';
+} from '../../shared/access-control-form-container/access-control-array-form/access-control-array-form.component';
 import { UiSwitchModule } from 'ngx-ui-switch';
 import {
   AccessControlFormContainerModule
diff --git a/src/app/community-page/edit-community-page/edit-community-page.module.ts b/src/app/community-page/edit-community-page/edit-community-page.module.ts
index 5ed2e401c6..d88aadfd8e 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.module.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.module.ts
@@ -14,7 +14,7 @@ import { CommunityAccessControlComponent } from './community-access-control/comm
 import { UiSwitchModule } from 'ngx-ui-switch';
 import {
   AccessControlArrayFormModule
-} from '../../shared/access-control-array-form/access-control-array-form.component';
+} from '../../shared/access-control-form-container/access-control-array-form/access-control-array-form.component';
 import {
   AccessControlFormContainerModule
 } from '../../shared/access-control-form-container/access-control-form-container.component';
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 322c6c6999..9d132abe53 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -47,9 +47,6 @@ import { IdentifierDataComponent } from '../../shared/object-list/identifier-dat
 import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
 import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
 import { ItemAccessControlComponent } from './item-access-control/item-access-control.component';
-import {
-  AccessControlArrayFormModule
-} from '../../shared/access-control-array-form/access-control-array-form.component';
 import { UiSwitchModule } from 'ngx-ui-switch';
 import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 import {
@@ -72,7 +69,6 @@ import {
     NgbModule,
     ItemVersionsModule,
     DsoSharedModule,
-    AccessControlArrayFormModule,
     UiSwitchModule,
     ResultsBackButtonModule,
     AccessControlFormContainerModule,
diff --git a/src/app/shared/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
similarity index 92%
rename from src/app/shared/access-control-array-form/access-control-array-form.component.html
rename to src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 24dcc11120..9b1f018ffb 100644
--- a/src/app/shared/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -1,4 +1,8 @@
 <form [formGroup]="form">
+  <div *ngIf="accessControl.controls.length === 0 && form.status !== 'DISABLED'" class="alert alert-warning">
+    {{'access-control-no-access-conditions-warning-message' | translate}}
+  </div>
+
   <ng-container *ngFor="let control of accessControl.controls; let i = index">
     <div [formGroup]="$any(control)"
          class="mt-3" data-testId="access-control-item"
diff --git a/src/app/shared/access-control-array-form/access-control-array-form.component.scss b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.scss
similarity index 100%
rename from src/app/shared/access-control-array-form/access-control-array-form.component.scss
rename to src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.scss
diff --git a/src/app/shared/access-control-array-form/access-control-array-form.component.spec.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts
similarity index 98%
rename from src/app/shared/access-control-array-form/access-control-array-form.component.spec.ts
rename to src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts
index b99a0fff8e..5c97e3abc5 100644
--- a/src/app/shared/access-control-array-form/access-control-array-form.component.spec.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AccessControlArrayFormComponent } from './access-control-array-form.component';
 import { ReactiveFormsModule } from '@angular/forms';
-import { SharedBrowseByModule } from '../browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../browse-by/shared-browse-by.module';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
diff --git a/src/app/shared/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
similarity index 96%
rename from src/app/shared/access-control-array-form/access-control-array-form.component.ts
rename to src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index 60060dec16..171bec8395 100644
--- a/src/app/shared/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, NgModule, OnDestroy, OnInit } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormArray, FormBuilder, FormControl, ReactiveFormsModule } from '@angular/forms';
-import { SharedBrowseByModule } from '../browse-by/shared-browse-by.module';
+import { SharedBrowseByModule } from '../../browse-by/shared-browse-by.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
 import { ControlMaxStartDatePipe } from './control-max-start-date.pipe';
@@ -9,7 +9,7 @@ import { ControlMaxEndDatePipe } from './control-max-end-date.pipe';
 
 import { distinctUntilChanged, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
-import { AccessesConditionOption } from '../../core/config/models/config-accesses-conditions-options.model';
+import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
 
 
 @Component({
diff --git a/src/app/shared/access-control-array-form/control-max-end-date.pipe.ts b/src/app/shared/access-control-form-container/access-control-array-form/control-max-end-date.pipe.ts
similarity index 87%
rename from src/app/shared/access-control-array-form/control-max-end-date.pipe.ts
rename to src/app/shared/access-control-form-container/access-control-array-form/control-max-end-date.pipe.ts
index 86ba3b996a..773c97e5e8 100644
--- a/src/app/shared/access-control-array-form/control-max-end-date.pipe.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/control-max-end-date.pipe.ts
@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { AbstractControl } from '@angular/forms';
 import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap/datepicker/ngb-date-struct';
-import { AccessesConditionOption } from '../../core/config/models/config-accesses-conditions-options.model';
+import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
 
 @Pipe({
   // eslint-disable-next-line @angular-eslint/pipe-prefix
diff --git a/src/app/shared/access-control-array-form/control-max-start-date.pipe.ts b/src/app/shared/access-control-form-container/access-control-array-form/control-max-start-date.pipe.ts
similarity index 87%
rename from src/app/shared/access-control-array-form/control-max-start-date.pipe.ts
rename to src/app/shared/access-control-form-container/access-control-array-form/control-max-start-date.pipe.ts
index 77be77b029..d3d7f186d5 100644
--- a/src/app/shared/access-control-array-form/control-max-start-date.pipe.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/control-max-start-date.pipe.ts
@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { AbstractControl } from '@angular/forms';
 import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap/datepicker/ngb-date-struct';
-import { AccessesConditionOption } from '../../core/config/models/config-accesses-conditions-options.model';
+import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
 
 
 @Pipe({
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index c45774dcf9..5e5c8311c4 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -41,12 +41,7 @@
             </div>
           </div>
 
-          <div class="mt-3">
-            <h5>{{'access-control-access-conditions' | translate}}</h5>
-            <div class="alert alert-warning">
-              {{'access-control-no-access-conditions-warning-message' | translate}}
-            </div>
-          </div>
+          <h5 class="mt-3">{{'access-control-access-conditions' | translate}}</h5>
 
           <ds-access-control-array-form
             #itemAccessCmp
@@ -127,13 +122,7 @@
             </div>
           </div>
 
-          <div class="mt-3">
-            <h5>{{'access-control-access-conditions' | translate}}</h5>
-
-            <div class="alert alert-warning">
-              {{'access-control-no-access-conditions-warning-message' | translate}}
-            </div>
-          </div>
+          <h5 class="mt-3">{{'access-control-access-conditions' | translate}}</h5>
 
           <ds-access-control-array-form
             #bitstreamAccessCmp
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 8a3a752588..eec4996073 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -5,7 +5,7 @@ import { Item } from '../../core/shared/item.model';
 import {
   AccessControlArrayFormComponent,
   AccessControlArrayFormModule
-} from '../access-control-array-form/access-control-array-form.component';
+} from './access-control-array-form/access-control-array-form.component';
 import { BulkAccessControlService } from './bulk-access-control.service';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -176,7 +176,7 @@ const initialState = {
     AccessControlFormContainerComponent,
     ItemAccessControlSelectBitstreamsModalComponent
   ],
-  exports: [ AccessControlFormContainerComponent ],
+  exports: [ AccessControlFormContainerComponent, AccessControlArrayFormModule ],
 })
 export class AccessControlFormContainerModule {}