diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0ecd9577f1c..e8ca1edb9bf 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -106,6 +106,10 @@ Bug Fixes
 * SOLR-5734: We should use System.nanoTime rather than System.currentTimeMillis
   when calculating elapsed time. (Mark Miller, Ramkumar Aiyengar)
 
+* SOLR-5760: ConcurrentUpdateSolrServer has a blockUntilFinished call when
+  streamDeletes is true that should be tucked into the if statement below it.
+  (Mark Miller, Gregory Chanan)
+
 Optimizations
 ----------------------
 * SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
index 8f940d455d2..6e1a65b4cf2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
@@ -283,8 +283,8 @@ public class ConcurrentUpdateSolrServer extends SolrServer {
       if ((req.getDocuments() == null || req.getDocuments().isEmpty())
           && (req.getDeleteById() == null || req.getDeleteById().isEmpty())
           && (req.getDeleteByIdMap() == null || req.getDeleteByIdMap().isEmpty())) {
-        blockUntilFinished();
         if (req.getDeleteQuery() == null) {
+          blockUntilFinished();
           return server.request(request);
         }
       }