diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h
index 698fa5a4dac..9fcecf66a08 100644
--- a/reactos/ntoskrnl/include/internal/mm.h
+++ b/reactos/ntoskrnl/include/internal/mm.h
@@ -253,7 +253,6 @@ typedef struct _MEMORY_AREA
 typedef struct _MADDRESS_SPACE
 {
     PMEMORY_AREA MemoryAreaRoot;
-    PEX_PUSH_LOCK Lock;
 } MADDRESS_SPACE, *PMADDRESS_SPACE;
 
 typedef struct
@@ -1576,14 +1575,14 @@ VOID
 MmLockAddressSpace(PMADDRESS_SPACE AddressSpace)
 {
     KeEnterCriticalRegion();
-    ExAcquirePushLockExclusive(AddressSpace->Lock);
+    ExAcquirePushLockExclusive((PEX_PUSH_LOCK)&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock);
 }
 
 FORCEINLINE
 VOID
 MmUnlockAddressSpace(PMADDRESS_SPACE AddressSpace)
 {
-    ExReleasePushLock(AddressSpace->Lock);
+    ExReleasePushLock((PEX_PUSH_LOCK)&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock);
     KeLeaveCriticalRegion();
 }
 
diff --git a/reactos/ntoskrnl/mm/aspace.c b/reactos/ntoskrnl/mm/aspace.c
index 56b880ad26c..2ef1a98d16e 100644
--- a/reactos/ntoskrnl/mm/aspace.c
+++ b/reactos/ntoskrnl/mm/aspace.c
@@ -32,8 +32,6 @@ MmInitializeAddressSpace(PEPROCESS Process,
                          PMADDRESS_SPACE AddressSpace)
 {
     AddressSpace->MemoryAreaRoot = NULL;
-    AddressSpace->Lock = (PEX_PUSH_LOCK)&Process->AddressCreationLock;
-    ExInitializePushLock((PULONG_PTR)AddressSpace->Lock);
     return STATUS_SUCCESS;
 }