diff --git a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
index 66dc28168..8e88fb4af 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
@@ -101,7 +101,7 @@ public class PropertyMapping extends AbstractModelElement {
         Set<Type> importTypes = new HashSet<Type>();
         importTypes.add( sourceType );
         importTypes.add( targetType );
-        if ( conversion != null ) {
+        if ( conversion != null && mappingMethod == null ) {
             importTypes.addAll( conversion.getImportTypes() );
         }