diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index 54aa498d4f2a3b..c12ac801e7eb64 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -2230,7 +2230,7 @@ void collectMapDataFromMapOperands(
   auto findMapInfo = [&mapData](llvm::Value *val, unsigned &index) {
     index = 0;
     for (llvm::Value *basePtr : mapData.OriginalValue) {
-      if (basePtr == val)
+      if (basePtr == val && !mapData.IsAMember[index])
         return true;
       index++;
     }