diff --git a/src/frontend/app/diffusions/diffusions-list.component.ts b/src/frontend/app/diffusions/diffusions-list.component.ts
index ba7b57a14f81091001d4baf29303deb90cb77d6f..4e139d50b57682ec008b882954c2b2ff216d843e 100644
--- a/src/frontend/app/diffusions/diffusions-list.component.ts
+++ b/src/frontend/app/diffusions/diffusions-list.component.ts
@@ -94,7 +94,8 @@ export class DiffusionsListComponent implements OnInit {
 
         if (this.resId !== null && this.target !== 'redirect') {
             this.loadListinstance(this.resId);
-
+        } else if (this.resId === null && this.entityId !== null) {
+            this.loadListModel(this.entityId);
         }
     }
 
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
index 2239c721d36ff3c5ac64f1d66308304e89ba186d..a49e3f22b5e8a62667ef6994ea135e1a86d8eb0a 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -6,7 +6,7 @@ import { HeaderService } from '../../../service/header.service';
 import { MatDialog } from '@angular/material/dialog';
 import { AppService } from '../../../service/app.service';
 import { tap, catchError, exhaustMap, filter } from 'rxjs/operators';
-import { of} from 'rxjs';
+import { of } from 'rxjs';
 import { SortPipe } from '../../../plugins/sorting.pipe';
 import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
 import { FormControl, Validators, FormGroup, ValidationErrors, ValidatorFn, AbstractControl } from '@angular/forms';
@@ -484,9 +484,6 @@ export class IndexingFormComponent implements OnInit {
                             }
                         });
                         elem.event = 'loadDiffusionList';
-                        if (elem.default_value !== null && !this.adminMode) {
-                            this.loadDiffusionList(elem, elem.default_value);
-                        }
                         elem.allowedEntities = elem.values.filter((val: any) => val.disabled === false).map((entities: any) => entities.id);
                     }
                     resolve(true);
@@ -1013,8 +1010,6 @@ export class IndexingFormComponent implements OnInit {
     }
 
     loadDiffusionList(field: any, value: any) {
-        setTimeout(() => {
-            this.appDiffusionsList.loadListModel(value);
-        }, 0);
+        this.appDiffusionsList.loadListModel(value);
     }
 }