diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index f9a2f4dc0c..175704f809 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -6145,6 +6145,11 @@ _user_create_area(const char* userName, void** userAddress, uint32 addressSpec,
 		&& IS_KERNEL_ADDRESS(address))
 		return B_BAD_VALUE;
 
+	if (addressSpec == B_ANY_ADDRESS)
+		addressSpec = B_RANDOMIZED_ANY_ADDRESS;
+	if (addressSpec == B_BASE_ADDRESS)
+		addressSpec = B_RANDOMIZED_BASE_ADDRESS;
+
 	fix_protection(&protection);
 
 	virtual_address_restrictions virtualRestrictions = {};