diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java
index 96004cb47..da73e1783 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java
@@ -103,7 +103,7 @@ public class NestedPropertyMappingMethod extends MappingMethod {
     public Set<Type> getImportTypes() {
         Set<Type> types = super.getImportTypes();
         for ( SafePropertyEntry propertyEntry : safePropertyEntries) {
-            types.add( propertyEntry.getType() );
+            types.addAll( propertyEntry.getType().getImportTypes() );
             if ( propertyEntry.getPresenceChecker() != null ) {
                 types.addAll( propertyEntry.getPresenceChecker().getImportTypes() );
             }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/ExampleDto.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/ExampleDto.java
new file mode 100644
index 000000000..eff9f2627
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/ExampleDto.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2797;
+
+/**
+ * @author Ben Zegveld
+ */
+public class ExampleDto {
+
+    private String personFirstName;
+    private String personLastName;
+
+    public String getPersonFirstName() {
+        return personFirstName;
+    }
+
+    public String getPersonLastName() {
+        return personLastName;
+    }
+
+    public void setPersonFirstName(String personFirstName) {
+        this.personFirstName = personFirstName;
+    }
+
+    public void setPersonLastName(String personLastName) {
+        this.personLastName = personLastName;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/ExampleMapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/ExampleMapper.java
new file mode 100644
index 000000000..eccac2725
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/ExampleMapper.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2797;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ap.test.bugs._2797.model.Example.Person;
+
+import static org.mapstruct.ReportingPolicy.ERROR;
+
+/**
+ * @author Ben Zegveld
+ */
+@Mapper(unmappedTargetPolicy = ERROR)
+public interface ExampleMapper {
+
+  @Mapping(target = "personFirstName", source = "names.first")
+  @Mapping(target = "personLastName", source = "names.last")
+  ExampleDto map(Person person);
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/Issue2797Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/Issue2797Test.java
new file mode 100644
index 000000000..7f3dd5f3d
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/Issue2797Test.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2797;
+
+import org.mapstruct.ap.test.bugs._2797.model.BasePerson;
+import org.mapstruct.ap.test.bugs._2797.model.Example;
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+/**
+ * @author Ben Zegveld
+ */
+@IssueKey( "2797" )
+@WithClasses( { ExampleDto.class, ExampleMapper.class, Example.class, BasePerson.class } )
+public class Issue2797Test {
+
+    @ProcessorTest
+    void shouldCompile() {
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/model/BasePerson.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/model/BasePerson.java
new file mode 100644
index 000000000..6b54e6ee3
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/model/BasePerson.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2797.model;
+
+/**
+ * @author Ben Zegveld
+ */
+public class BasePerson {
+
+    private Names names;
+
+    public Names getNames() {
+        return names;
+    }
+
+    public void setNames(Names names) {
+        this.names = names;
+    }
+
+  public static class Names {
+
+        private String first;
+        private String last;
+
+        public String getFirst() {
+            return first;
+        }
+
+        public String getLast() {
+            return last;
+        }
+
+        public void setFirst(String first) {
+            this.first = first;
+        }
+
+        public void setLast(String last) {
+            this.last = last;
+        }
+  }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/model/Example.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/model/Example.java
new file mode 100644
index 000000000..4dfa40f69
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2797/model/Example.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2797.model;
+
+/**
+ * @author Ben Zegveld
+ */
+public class Example {
+
+  public static class Person extends BasePerson {
+
+  }
+}