From c5cd08efe3b68b35ac41bff705b48e67278797d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4llman?= <jan.kallman@epplussoftware.com>
Date: Thu, 4 Jun 2026 14:35:31 +0200
Subject: [PATCH] Fixes issue #2376

---
 src/EPPlus/Core/CellStore/RangeDictionary.cs         | 1 +
 src/EPPlusTest/DataValidation/DataValidationTests.cs | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/EPPlus/Core/CellStore/RangeDictionary.cs b/src/EPPlus/Core/CellStore/RangeDictionary.cs
index a81ad06e80..c110024c17 100644
--- a/src/EPPlus/Core/CellStore/RangeDictionary.cs
+++ b/src/EPPlus/Core/CellStore/RangeDictionary.cs
@@ -133,6 +133,7 @@ internal bool Exists(int row, int col)
         }
         internal List<T> GetValuesFromRange(int fromRow, int fromCol, int toRow, int toCol)
         {
+            if (_addresses.Keys.Count == 0) return new List<T>();
             var hs = new HashSet<T>();
             long rowSpan = ((fromRow - 1) << 20) | (fromRow - 1);
             var searchItem = new RangeItem(rowSpan, default);
diff --git a/src/EPPlusTest/DataValidation/DataValidationTests.cs b/src/EPPlusTest/DataValidation/DataValidationTests.cs
index b99ab5aee4..d0980466a6 100644
--- a/src/EPPlusTest/DataValidation/DataValidationTests.cs
+++ b/src/EPPlusTest/DataValidation/DataValidationTests.cs
@@ -1295,5 +1295,12 @@ public void DataValidationsPerformance()
                 SaveAndCleanup(p);
             }
         }
-    }    
+        [TestMethod]
+        public void VerifyClearDataValidationOnEmptyRange()
+        {
+            using var p = new ExcelPackage();
+            var ws = p.Workbook.Worksheets.Add("Sheet1");
+            ws.Cells[1, 1, 4, 4].DataValidation.ClearDataValidation();
+        }
+    }
 }
\ No newline at end of file