diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index f7ed2b22b70a..6b1775ce34a3 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -143,7 +143,7 @@ THE SOFTWARE.
                                       and !builtInHasExecutors)}"/>
   <!-- Remove the built-in from the list when it is included but has no executors to show -->
   <j:choose>
-    <j:when test="${!builtInHasExecutors and computers.get(0).node == app and computers.size() gt 1}">
+    <j:when test="${!builtInHasExecutors and computers.size() gt 1 and computers.get(0).node == app}">
       <j:set var="computers" value="${computers.subList(1, computers.size())}"/>
     </j:when>
   </j:choose>