diff --git a/core/memory/heap_allocators/Xalloc/Xalloc.hpp b/core/memory/heap_allocators/Xalloc/Xalloc.hpp
index 44cdbc98..9f147024 100644
--- a/core/memory/heap_allocators/Xalloc/Xalloc.hpp
+++ b/core/memory/heap_allocators/Xalloc/Xalloc.hpp
@@ -27,7 +27,7 @@ typedef __SIZE_TYPE__ Xsize_t;
 typedef __UINTPTR_TYPE__ Xuintptr_t;
 
 #define Xalloc_StopOnFail true
-#define Xalloc_MapPages true
+#define Xalloc_MapPages false
 #define Xalloc_PAGE_SIZE PAGE_SIZE
 #define Xalloc_trace(m, ...) trace(m, ##__VA_ARGS__)
 #define Xalloc_warn(m, ...) warn(m, ##__VA_ARGS__)
diff --git a/core/memory/memory.cpp b/core/memory/memory.cpp
index 79e41210..666bb209 100644
--- a/core/memory/memory.cpp
+++ b/core/memory/memory.cpp
@@ -386,13 +386,13 @@ NIF void InitializeMemoryManagement()
 		break;
 	case MemoryAllocatorType::XallocV1:
 	{
-		XallocV1Allocator = new Xalloc::V1((void *)KERNEL_HEAP_BASE, false, false);
+		XallocV1Allocator = new Xalloc::V1((void *)nullptr, false, false);
 		trace("XallocV1 Allocator initialized at %#lx", XallocV1Allocator);
 		break;
 	}
 	case MemoryAllocatorType::XallocV2:
 	{
-		XallocV2Allocator = new Xalloc::V2((void *)KERNEL_HEAP_BASE);
+		XallocV2Allocator = new Xalloc::V2((void *)nullptr);
 		trace("XallocV2 Allocator initialized at %#lx", XallocV2Allocator);
 		break;
 	}