diff --git a/src/multimap_table.rs b/src/multimap_table.rs
index c0e3cf50..0cc2df0e 100644
--- a/src/multimap_table.rs
+++ b/src/multimap_table.rs
@@ -6,7 +6,7 @@ use crate::tree_store::{
     btree_stats, AllPageNumbersBtreeIter, BranchAccessor, Btree, BtreeHeader, BtreeMut,
     BtreeRangeIter, BtreeStats, CachePriority, Checksum, LeafAccessor, LeafMutator, Page, PageHint,
     PageNumber, RawBtree, RawLeafBuilder, TransactionalMemory, UntypedBtreeMut, BRANCH, LEAF,
-    MAX_VALUE_LENGTH,
+    MAX_PAIR_LENGTH, MAX_VALUE_LENGTH,
 };
 use crate::types::{Key, TypeName, Value};
 use crate::{AccessGuard, MultimapTableHandle, Result, StorageError, WriteTransaction};
@@ -833,9 +833,12 @@ impl<'txn, K: Key + 'static, V: Key + 'static> MultimapTable<'txn, K, V> {
         if value_bytes_ref.len() > MAX_VALUE_LENGTH {
             return Err(StorageError::ValueTooLarge(value_bytes_ref.len()));
         }
-        let key_bytes = K::as_bytes(key.borrow());
-        if key_bytes.as_ref().len() > MAX_VALUE_LENGTH {
-            return Err(StorageError::ValueTooLarge(key_bytes.as_ref().len()));
+        let key_len = K::as_bytes(key.borrow()).as_ref().len();
+        if key_len > MAX_VALUE_LENGTH {
+            return Err(StorageError::ValueTooLarge(key_len));
+        }
+        if value_bytes_ref.len() + key_len > MAX_PAIR_LENGTH {
+            return Err(StorageError::ValueTooLarge(value_bytes_ref.len() + key_len));
         }
         let get_result = self.tree.get(key.borrow())?;
         let existed = if get_result.is_some() {
diff --git a/src/table.rs b/src/table.rs
index ed9dfb73..97c76494 100644
--- a/src/table.rs
+++ b/src/table.rs
@@ -2,7 +2,7 @@ use crate::db::TransactionGuard;
 use crate::sealed::Sealed;
 use crate::tree_store::{
     AccessGuardMut, Btree, BtreeExtractIf, BtreeHeader, BtreeMut, BtreeRangeIter, PageHint,
-    PageNumber, RawBtree, TransactionalMemory, MAX_VALUE_LENGTH,
+    PageNumber, RawBtree, TransactionalMemory, MAX_PAIR_LENGTH, MAX_VALUE_LENGTH,
 };
 use crate::types::{Key, MutInPlaceValue, Value};
 use crate::{AccessGuard, StorageError, WriteTransaction};
@@ -201,6 +201,9 @@ impl<'txn, K: Key + 'static, V: Value + 'static> Table<'txn, K, V> {
         if key_len > MAX_VALUE_LENGTH {
             return Err(StorageError::ValueTooLarge(key_len));
         }
+        if value_len + key_len > MAX_PAIR_LENGTH {
+            return Err(StorageError::ValueTooLarge(value_len + key_len));
+        }
         self.tree.insert(key.borrow(), value.borrow())
     }
 
@@ -233,6 +236,9 @@ impl<'txn, K: Key + 'static, V: MutInPlaceValue + 'static> Table<'txn, K, V> {
         if key_len > MAX_VALUE_LENGTH {
             return Err(StorageError::ValueTooLarge(key_len));
         }
+        if value_length as usize + key_len > MAX_PAIR_LENGTH {
+            return Err(StorageError::ValueTooLarge(value_length as usize + key_len));
+        }
         self.tree.insert_reserve(key.borrow(), value_length)
     }
 }
diff --git a/src/transactions.rs b/src/transactions.rs
index f848bd33..39c6d724 100644
--- a/src/transactions.rs
+++ b/src/transactions.rs
@@ -7,7 +7,7 @@ use crate::transaction_tracker::{SavepointId, TransactionId, TransactionTracker}
 use crate::tree_store::{
     Btree, BtreeHeader, BtreeMut, FreedPageList, FreedTableKey, InternalTableDefinition, PageHint,
     PageNumber, SerializedSavepoint, TableTree, TableTreeMut, TableType, TransactionalMemory,
-    MAX_VALUE_LENGTH,
+    MAX_PAIR_LENGTH, MAX_VALUE_LENGTH,
 };
 use crate::types::{Key, Value};
 use crate::{
@@ -244,6 +244,9 @@ impl<'db, 's, K: Key + 'static, V: Value + 'static> SystemTable<'db, 's, K, V> {
         if key_len > MAX_VALUE_LENGTH {
             return Err(StorageError::ValueTooLarge(key_len));
         }
+        if value_len + key_len > MAX_PAIR_LENGTH {
+            return Err(StorageError::ValueTooLarge(value_len + key_len));
+        }
         self.tree.insert(key.borrow(), value.borrow())
     }
 
diff --git a/src/tree_store/mod.rs b/src/tree_store/mod.rs
index 8b82fa16..746a1f95 100644
--- a/src/tree_store/mod.rs
+++ b/src/tree_store/mod.rs
@@ -14,7 +14,7 @@ pub(crate) use btree_iters::{AllPageNumbersBtreeIter, BtreeExtractIf, BtreeRange
 pub use page_store::{file_backend, InMemoryBackend, Savepoint};
 pub(crate) use page_store::{
     CachePriority, Page, PageHint, PageNumber, SerializedSavepoint, TransactionalMemory,
-    FILE_FORMAT_VERSION2, MAX_VALUE_LENGTH, PAGE_SIZE,
+    FILE_FORMAT_VERSION2, MAX_PAIR_LENGTH, MAX_VALUE_LENGTH, PAGE_SIZE,
 };
 pub(crate) use table_tree::{
     FreedPageList, FreedTableKey, InternalTableDefinition, TableTree, TableTreeMut, TableType,
diff --git a/src/tree_store/page_store/base.rs b/src/tree_store/page_store/base.rs
index bcef6944..4c91fa1a 100644
--- a/src/tree_store/page_store/base.rs
+++ b/src/tree_store/page_store/base.rs
@@ -11,6 +11,7 @@ use std::sync::Arc;
 use std::sync::Mutex;
 
 pub(crate) const MAX_VALUE_LENGTH: usize = 3 * 1024 * 1024 * 1024;
+pub(crate) const MAX_PAIR_LENGTH: usize = 3 * 1024 * 1024 * 1024 + 768 * 1024 * 1024;
 pub(crate) const MAX_PAGE_INDEX: u32 = 0x000F_FFFF;
 
 // On-disk format is:
diff --git a/src/tree_store/page_store/mod.rs b/src/tree_store/page_store/mod.rs
index dfe48f77..eb642c8d 100644
--- a/src/tree_store/page_store/mod.rs
+++ b/src/tree_store/page_store/mod.rs
@@ -12,7 +12,7 @@ mod savepoint;
 #[allow(dead_code)]
 mod xxh3;
 
-pub(crate) use base::{Page, PageHint, PageNumber, MAX_VALUE_LENGTH};
+pub(crate) use base::{Page, PageHint, PageNumber, MAX_PAIR_LENGTH, MAX_VALUE_LENGTH};
 pub(crate) use header::PAGE_SIZE;
 pub use in_memory_backend::InMemoryBackend;
 pub(crate) use page_manager::{xxh3_checksum, TransactionalMemory, FILE_FORMAT_VERSION2};
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index b9be0165..2680d013 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -230,6 +230,44 @@ fn large_values() {
     txn.commit().unwrap();
 }
 
+// Note: this test requires > 3GiB of memory
+#[test]
+fn value_too_large() {
+    let tmpfile = create_tempfile();
+
+    let db = Database::create(tmpfile.path()).unwrap();
+    let txn = db.begin_write().unwrap();
+
+    let small_value = vec![0u8; 1024];
+    let too_big_value = vec![0u8; 3 * 1024 * 1024 * 1024 + 1];
+    {
+        let mut table = txn.open_table(SLICE_TABLE).unwrap();
+        assert!(matches!(
+            table.insert(small_value.as_slice(), too_big_value.as_slice()),
+            Err(StorageError::ValueTooLarge(_))
+        ));
+        assert!(matches!(
+            table.insert(too_big_value.as_slice(), small_value.as_slice()),
+            Err(StorageError::ValueTooLarge(_))
+        ));
+        assert!(matches!(
+            table.insert(too_big_value.as_slice(), too_big_value.as_slice()),
+            Err(StorageError::ValueTooLarge(_))
+        ));
+        drop(too_big_value);
+        let almost_big_value = vec![0u8; 2 * 1024 * 1024 * 1024];
+        assert!(matches!(
+            table.insert(almost_big_value.as_slice(), almost_big_value.as_slice()),
+            Err(StorageError::ValueTooLarge(_))
+        ));
+    }
+    txn.commit().unwrap();
+
+    let txn = db.begin_read().unwrap();
+    let table = txn.open_table(SLICE_TABLE).unwrap();
+    assert!(table.is_empty().unwrap());
+}
+
 #[test]
 fn many_pairs() {
     let tmpfile = create_tempfile();