diff --git a/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java b/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
index e61aeb3d7088..6b450dea75ff 100644
--- a/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
+++ b/gluten-celeborn/common/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
@@ -93,7 +93,7 @@ public class CelebornShuffleManager implements ShuffleManager {
   private final Object shuffleIdTracker;
 
   // for Celeborn 0.4.0
-  private boolean throwsFetchFailure;
+  private final boolean throwsFetchFailure;
 
   public CelebornShuffleManager(SparkConf conf) {
     if (conf.getBoolean(LOCAL_SHUFFLE_READER_KEY, true)) {
@@ -244,10 +244,14 @@ public void stop() {
       lifecycleManager.stop();
       lifecycleManager = null;
     }
-    if (columnarShuffleManager() != null) {
-      columnarShuffleManager().stop();
+    if (_columnarShuffleManager != null) {
+      _columnarShuffleManager.stop();
       _columnarShuffleManager = null;
     }
+    if (_vanillaCelebornShuffleManager != null) {
+      _vanillaCelebornShuffleManager.stop();
+      _vanillaCelebornShuffleManager = null;
+    }
   }
 
   @Override