diff --git a/fdbserver/IPager.h b/fdbserver/IPager.h
index bc2a0f68f1..3514dd3a06 100644
--- a/fdbserver/IPager.h
+++ b/fdbserver/IPager.h
@@ -56,9 +56,6 @@ public:
 		if (userData != nullptr && userDataDestructor != nullptr) {
 			userDataDestructor(userData);
 		}
-		if (buffer != nullptr) {
-			VALGRIND_MAKE_MEM_UNDEFINED(buffer, bufferSize);
-		}
 	}
 
 	uint8_t const* begin() const { return (uint8_t*)buffer; }
diff --git a/flow/Arena.cpp b/flow/Arena.cpp
index 096ded32fd..77ea8f1055 100644
--- a/flow/Arena.cpp
+++ b/flow/Arena.cpp
@@ -241,10 +241,11 @@ void* ArenaBlock::make4kAlignedBuffer(uint32_t size) {
 	r->aligned4kBuffer = allocateFast4kAligned(size);
 	// printf("Arena::aligned4kBuffer alloc size=%u ptr=%p\n", size, r->aligned4kBuffer);
 	r->nextBlockOffset = nextBlockOffset;
+	auto result = r->aligned4kBuffer;
 	makeNoAccess(r, sizeof(ArenaBlockRef));
 	nextBlockOffset = bigUsed;
 	bigUsed += sizeof(ArenaBlockRef);
-	return r->aligned4kBuffer;
+	return result;
 }
 
 void ArenaBlock::dependOn(Reference<ArenaBlock>& self, ArenaBlock* other) {