diff --git a/src/core/SkBlockAllocator.cpp b/src/core/SkBlockAllocator.cpp
index 0cd608044d..f163a35829 100644
--- a/src/core/SkBlockAllocator.cpp
+++ b/src/core/SkBlockAllocator.cpp
@@ -16,8 +16,9 @@ SkBlockAllocator::SkBlockAllocator(GrowthPolicy policy, size_t blockIncrementByt
         : fTail(&fHead)
         // Round up to the nearest max-aligned value, and then divide so that fBlockSizeIncrement
         // can effectively fit higher byte counts in its 16 bits of storage
-        , fBlockIncrement(SkTo<uint16_t>(SkAlignTo(blockIncrementBytes, kAddressAlign)
-                                                / kAddressAlign))
+        , fBlockIncrement(SkTo<uint16_t>(
+                std::min(SkAlignTo(blockIncrementBytes, kAddressAlign) / kAddressAlign,
+                         (size_t) std::numeric_limits<uint16_t>::max())))
         , fGrowthPolicy(static_cast<uint64_t>(policy))
         , fN0((policy == GrowthPolicy::kLinear || policy == GrowthPolicy::kExponential) ? 1 : 0)
         , fN1(1)
diff --git a/tests/SkTBlockListTest.cpp b/tests/SkTBlockListTest.cpp
index 0032453f54..bb0c73e583 100644
--- a/tests/SkTBlockListTest.cpp
+++ b/tests/SkTBlockListTest.cpp
@@ -48,6 +48,8 @@ public:
     static size_t TotalSize(SkTBlockList<C, N>& list) {
         return list.fAllocator->totalSize();
     }
+
+    static constexpr size_t kAddressAlign = SkBlockAllocator::kAddressAlign;
 };
 
 // Checks that the allocator has the correct count, etc and that the element IDs are correct.
@@ -300,6 +302,20 @@ static void run_reserve_test(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, 0 == C::gInstCnt);
 }
 
+void run_large_increment_test(skiatest::Reporter* reporter) {
+    static constexpr size_t kIncrementMax = std::numeric_limits<uint16_t>::max();
+    // Pick an item count such that count*sizeof(C)/max align exceeds uint16_t max.
+    int itemCount = (int) (sizeof(C) * kIncrementMax / TBlockListTestAccess::kAddressAlign) + 1;
+    SkTBlockList<C> largeIncrement(itemCount);
+    // Trigger a scratch block allocation, which given default fixed growth policy, will be one
+    // block increment.
+    largeIncrement.reserve(10);
+    size_t scratchSize = TBlockListTestAccess::ScratchBlockSize(largeIncrement);
+    // SkBlockAllocator aligns large blocks to 4k
+    size_t expected = SkAlignTo(kIncrementMax * TBlockListTestAccess::kAddressAlign, (1 << 12));
+    REPORTER_ASSERT(reporter, scratchSize == expected);
+}
+
 DEF_TEST(SkTBlockList, reporter) {
     // Test combinations of allocators with and without stack storage and with different block sizes
     SkTBlockList<C> a1(1);
@@ -335,4 +351,6 @@ DEF_TEST(SkTBlockList, reporter) {
     run_concat_trivial_test<5, 1>(reporter, 50, 10);
     run_concat_trivial_test<1, 5>(reporter, 10, 50);
     run_concat_trivial_test<5, 5>(reporter, 100, 100);
+
+    run_large_increment_test(reporter);
 }