diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 219f64bba..02249463f 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -16,6 +16,8 @@
 #include "../z_zone.h"
 #include <new>
 
+#include "../lua_script.h"
+
 using namespace srb2;
 
 namespace
@@ -118,6 +120,9 @@ void* PoolAllocator::allocate()
 
 void PoolAllocator::deallocate(void* p)
 {
+	// Required in case this block is reused
+	LUA_InvalidateUserdata(p);
+
 	FreeBlock* block = reinterpret_cast<FreeBlock*>(p);
 	block->next = head_;
 	head_ = block;
@@ -128,6 +133,12 @@ void PoolAllocator::release()
 	ChunkFooter* next = nullptr;
 	for (ChunkFooter* i = first_chunk_; i != nullptr; i = next)
 	{
+		uint8_t *chunk = (uint8_t*)i->start;
+		for (size_t j = 0; j < blocks_; j++)
+		{
+			// Invalidate all blocks that possibly weren't passed to deallocate
+			LUA_InvalidateUserdata(chunk + (j * block_size_));
+		}
 		next = i->next;
 		Z_Free(i->start);
 	}