diff --git a/src/javascripts/ng-admin/Crud/field/maChoiceField.js b/src/javascripts/ng-admin/Crud/field/maChoiceField.js
index ecbd7ec8..a0caffc8 100644
--- a/src/javascripts/ng-admin/Crud/field/maChoiceField.js
+++ b/src/javascripts/ng-admin/Crud/field/maChoiceField.js
@@ -37,25 +37,33 @@ export default function maChoiceField($compile) {
                         itemsFilter = '';
                     }
 
-                    var choices = (typeof scope.choices == 'function' && scope.choices()) ? scope.choices() : (field.choices ? field.choices() : []);
+                    const choices = scope.choices ? scope.choices : field.choices ? field.choices() : [];
+                    let choicesFactory;
+
+                    if (typeof choices === 'function' && choices(scope.entry)) {
+                        choicesFactory = choices;
+                        scope.choices = choicesFactory(scope.entry);
+                    } else {
+                        scope.choices = choices ? choices : [];
+                    }
 
                     var template = `
                         <ui-select ng-model="$parent.value" ng-required="v.required" id="{{ name }}" name="{{ name }}">
                             <ui-select-match allow-clear="{{ !v.required }}" placeholder="{{ placeholder | translate }}">{{ $select.selected.label | translate }}</ui-select-match>
-                            <ui-select-choices ${refreshAttributes} repeat="item.value as item in choices ${itemsFilter}  track by $index">
+                            <ui-select-choices ${refreshAttributes} repeat="item.value as item in choices ${itemsFilter} track by $index">
                                 {{ item.label | translate }}
                             </ui-select-choices>
                         </ui-select>`;
 
                     // as choices may be a function depending of another entry field, we need to watch the whole entry
                     scope.$watch('entry', (newEntry, oldEntry) => {
-                        if (typeof(choices) !== 'function') {
-                            scope.choices = choices;
+                        if (!choicesFactory) {
                             return;
                         }
 
-                        scope.choices = choices(newEntry);
-                        if (!angular.equals(scope.choices, choices(oldEntry))) {
+                        const oldChoices = scope.choices;
+                        scope.choices = choicesFactory(newEntry);
+                        if (!angular.equals(scope.choices, oldChoices)) {
                             scope.value = null;
                         }
                     }, true);