diff --git a/server.go b/server.go
index 48a64aa8c8..de20ff65c7 100644
--- a/server.go
+++ b/server.go
@@ -477,6 +477,9 @@ func (srv *Server) poolAdd(kind, key string) error {
 	if _, exists := srv.pullingPool[key]; exists {
 		return fmt.Errorf("pull %s is already in progress", key)
 	}
+	if _, exists := srv.pushingPool[key]; exists {
+		return fmt.Errorf("push %s is already in progress", key)
+	}
 
 	switch kind {
 	case "pull":