diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index b2759a713c..4e18918625 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -2090,9 +2090,12 @@ vm_get_page_mapping(team_id team, addr_t vaddr, addr_t* paddr)
 	if (addressSpace == NULL)
 		return B_BAD_TEAM_ID;
 
+	VMTranslationMap* map = addressSpace->TranslationMap();
+
+	map->Lock();
 	uint32 dummyFlags;
-	status_t status = addressSpace->TranslationMap()->Query(vaddr, paddr,
-		&dummyFlags);
+	status_t status = map->Query(vaddr, paddr, &dummyFlags);
+	map->Unlock();
 
 	addressSpace->Put();
 	return status;