diff --git a/src/cunumeric/matrix/batched_cholesky_template.inl b/src/cunumeric/matrix/batched_cholesky_template.inl
index d2bc7636e..79dff7edb 100644
--- a/src/cunumeric/matrix/batched_cholesky_template.inl
+++ b/src/cunumeric/matrix/batched_cholesky_template.inl
@@ -22,6 +22,7 @@
 #include "cunumeric/matrix/batched_cholesky.h"
 #include "cunumeric/matrix/potrf_template.inl"
 #include "cunumeric/matrix/transpose_template.inl"
+#include "cunumeric/pitches.h"
 
 namespace cunumeric {
 
@@ -67,6 +68,11 @@ struct BatchedCholeskyImpl {
         "Batched cholesky is not supported when input/output shapes differ");
     }
 
+    Pitches<DIM - 1> pitches;
+    size_t volume = pitches.flatten(shape);
+
+    if (volume == 0) return;
+
     auto ncols = shape.hi[DIM - 1] - shape.lo[DIM - 1] + 1;
 
     size_t in_strides[DIM];
diff --git a/tests/unit/cunumeric/test_config.py b/tests/unit/cunumeric/test_config.py
index 5e85ccfde..6f8f43df5 100644
--- a/tests/unit/cunumeric/test_config.py
+++ b/tests/unit/cunumeric/test_config.py
@@ -117,6 +117,7 @@ def test_CuNumericOpCode() -> None:
         "ADVANCED_INDEXING",
         "ARANGE",
         "ARGWHERE",
+        "BATCHED_CHOLESKY",
         "BINARY_OP",
         "BINARY_RED",
         "BINCOUNT",