diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/AbstractHashBinaryRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/AbstractHashBinaryRecordBatch.java
index 42dbc1cbfc5..3fef85f20a6 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/AbstractHashBinaryRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/AbstractHashBinaryRecordBatch.java
@@ -532,6 +532,8 @@ public IterOutcome innerNext() {
       return rightUpstream;
     }
 
+    boolean isExistException = false;
+
     try {
       /*
        * If we are here for the first time, execute the build phase of the hash
@@ -687,6 +689,24 @@ public IterOutcome innerNext() {
       return IterOutcome.NONE;
     } catch (SchemaChangeException e) {
       throw UserException.schemaChangeError(e).build(logger);
+    } catch (OutOfMemoryException oom) {
+      isExistException = true;
+      throw UserException.memoryError(oom).build(logger);
+    } catch (Exception e) {
+      //Internal catch OutOfMemoryException, resulting in throwing other exceptions or others
+      isExistException = true;
+      throw UserException.executionError(e).build(logger);
+    } finally {
+      boolean isReleaseBuildBatch = buildBatch != null && buildBatch instanceof SpilledRecordBatch;
+      boolean isReleaseProbeBatch = probeBatch != null && probeBatch instanceof SpilledRecordBatch;
+      //release buildBatch spill memory
+      if (isExistException && isReleaseBuildBatch) {
+        buildBatch.cancel();
+      }
+      //release probeBatch spill memory
+      if (isExistException && isReleaseProbeBatch) {
+        probeBatch.cancel();
+      }
     }
   }