diff --git a/cmd/woodpecker-autoscaler.go b/cmd/woodpecker-autoscaler.go
index 8ba8f1b..26340e7 100644
--- a/cmd/woodpecker-autoscaler.go
+++ b/cmd/woodpecker-autoscaler.go
@@ -86,7 +86,7 @@ func main() {
 					"Caller": "Main",
 				}).Fatal(fmt.Sprintf("Error checking woodpecker queue: %s", err.Error()))
 			}
-			if runningTasks <= len(ownedNodes) && runningTasks != 0 {
+			if runningTasks <= len(ownedNodes) && runningTasks != 0 && pendingTasks > 0 {
 				log.WithFields(log.Fields{
 					"Caller": "Main",
 				}).Info("Still found running tasks. No agent to be removed")