diff --git a/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java b/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java
index d74d0ea6..683a8473 100644
--- a/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java
+++ b/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java
@@ -333,6 +333,10 @@ private boolean isAnotherBuildWithSameParametersRunningOnNode(Node node, Queue.I
             itemParams = doFilterParams(paramsToCompare, itemParams);
         }
 
+        if (itemParams.size() == 0) {
+            return false;
+        }
+
         if (computer != null) {
             for (Executor exec : computer.getExecutors()) {
                 // TODO: refactor into a nameEquals helper method
@@ -343,7 +347,7 @@ private boolean isAnotherBuildWithSameParametersRunningOnNode(Node node, Queue.I
                     List<ParameterValue> executingUnitParams = getParametersFromWorkUnit(exec.getCurrentWorkUnit());
                     executingUnitParams = doFilterParams(paramsToCompare, executingUnitParams);
 
-                    if (executingUnitParams.containsAll(itemParams)) {
+                    if (executingUnitParams.size() > 0 && executingUnitParams.containsAll(itemParams)) {
                         LOGGER.log(Level.FINE, "build (" + exec.getCurrentWorkUnit() +
                                 ") with identical parameters (" +
                                 executingUnitParams + ") is already running.");