diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
index 46090efaf..41a785620 100644
--- a/inc/fields/dropdownfield.class.php
+++ b/inc/fields/dropdownfield.class.php
@@ -145,13 +145,14 @@ public function displayField($canEdit = true) {
             $dparams = ['name'     => $fieldName,
                         'value'    => $this->value,
                         'comments' => false,
-                        'entity'   => $_SESSION['glpiactive_entity'], // TODO: replace by Session::getActiveEntity when dropping GLPI 9.4
+                        'entity'   => $_SESSION['glpiactiveentities'],
                         'displaywith' => ['id'],
                         'rand'     => $rand];
 
             $dparams_cond_crit = [];
             switch ($itemtype) {
                case Entity::class:
+               case Document::class:
                   unset($dparams['entity']);
 
                case User::class: