diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapper.java
index 767e49f..44ff15c 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapper.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapper.java
@@ -53,10 +53,13 @@ public class TherapieplanDataMapper implements DataMapper<MtbCarePlan> {
                 .id(therapieplanData.getString("id"))
                 .patient(getPatientReference(therapieplanData.getString("patient_id")))
                 .issuedOn(therapieplanData.getDate("datum"))
-                .medicationRecommendations(einzelempfehlungWirkstoffDataMapper.getByParentId(id))
                 .procedureRecommendations(einzelempfehlungProzedurDataMapper.getByParentId(id))
         ;
 
+        if (therapieplanData.isTrue("mit_einzelempfehlung")) {
+            builder.medicationRecommendations(einzelempfehlungWirkstoffDataMapper.getByParentId(id));
+        }
+
         // Formularfeld "protokollauszug"
         if (therapieplanData.getString("protokollauszug") != null) {
             // TODO see https://github.com/dnpm-dip/mtb-model/issues/8
diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapperTest.java
index 78b2e07..3c18c2d 100644
--- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapperTest.java
+++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapperTest.java
@@ -46,7 +46,8 @@ class TherapieplanDataMapperTest {
                 "id", "1",
                 "patient_id", "42",
                 "wirkstoffe_json", "[{\"code\":\"\",\"name\":\"PARP-Inhibierung\",\"system\":\"UNREGISTERED\"}]",
-                "protokollauszug", "Das ist ein Protokollauszug"
+                "protokollauszug", "Das ist ein Protokollauszug",
+                "mit_einzelempfehlung", true
         );
 
         doAnswer(invocationOnMock -> {
@@ -54,6 +55,11 @@ class TherapieplanDataMapperTest {
             return testData.get(columnName);
         }).when(resultSet).getString(anyString());
 
+        doAnswer(invocationOnMock -> {
+            var columnName = invocationOnMock.getArgument(0, String.class);
+            return testData.get(columnName);
+        }).when(resultSet).isTrue(anyString());
+
         doAnswer(invocationOnMock -> resultSet)
                 .when(therapieplanCatalogue)
                 .getById(anyInt());