diff --git a/src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php b/src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php
index a9d22f65ec..3d0108498a 100644
--- a/src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php
+++ b/src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php
@@ -41,11 +41,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return [];
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 
@@ -60,11 +55,6 @@ public function loadValuesForChoices(array $choices, $value = null)
             return [];
         }
 
-        // If no callable is set, choices are the same as values
-        if (null === $value) {
-            return $choices;
-        }
-
         return $this->loadChoiceList($value)->getValuesForChoices($choices);
     }
 }