diff --git a/lib/galaxy/tools/deps/container_resolvers/explicit.py b/lib/galaxy/tools/deps/container_resolvers/explicit.py
index 851f0c1f99c..be83e0d92f7 100644
--- a/lib/galaxy/tools/deps/container_resolvers/explicit.py
+++ b/lib/galaxy/tools/deps/container_resolvers/explicit.py
@@ -20,7 +20,7 @@ class ExplicitContainerResolver(ContainerResolver):
         a correct container.
         """
         for container_description in tool_info.container_descriptions:
-            if self._container_type_enabled(container_description):
-                return True
+            if self._container_type_enabled(container_description, enabled_container_types):
+                return container_description
 
-        return False
+        return None