diff --git a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
index 1f9732565709d..4eeeb9aa9c7ab 100644
--- a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
@@ -170,9 +170,9 @@ class ShuffleBlockManager(blockManager: BlockManager) extends Logging {
   }
 
   /** Remove all the blocks / files and metadata related to a particular shuffle. */
-  def removeShuffle(shuffleId: ShuffleId) {
-    removeShuffleBlocks(shuffleId)
+  def removeShuffle(shuffleId: ShuffleId): Boolean = {
     shuffleStates.remove(shuffleId)
+    removeShuffleBlocks(shuffleId)
   }
 
   /** Remove all the blocks / files related to a particular shuffle. */