diff --git a/components/pdftemplates/finalComments_pdf.js b/components/pdftemplates/finalComments_pdf.js
index 1f4cce17..d90c04db 100644
--- a/components/pdftemplates/finalComments_pdf.js
+++ b/components/pdftemplates/finalComments_pdf.js
@@ -257,7 +257,7 @@ export const finalComments_pdf = ({ docProps }) => {
                                     :
                                 </Text>
                                 <Text style={styles.questionAnswer}>
-                                    {values.siteAddress}
+                                    {values.siteAddress.replace(/false/gm, " ")}
                                 </Text>
                             </View>
                             <View
@@ -448,24 +448,37 @@ export const finalComments_pdf = ({ docProps }) => {
                                     </Text>
                                 </View>
                             </View>
-                            <View
-                                wrap={false}
-                                style={{
-                                    flexDirection: "row",
-                                    marginBottom: 10,
-                                }}
-                            >
-                                <Text style={{ width: "18%", fontSize: 12 }}>
-                                    {getTrans(
-                                        docProps.locale,
-                                        "statement-onbehalf-label"
-                                    )}
-                                    :
-                                </Text>
-                                <Text style={styles.questionAnswerWide}>
-                                    {values.representationCapacity}
-                                </Text>
-                            </View>
+
+                            {values.hasOwnProperty(
+                                "representationOnBehalfOf_details"
+                            ) ? (
+                                <View
+                                    wrap={false}
+                                    style={{
+                                        flexDirection: "row",
+                                        marginBottom: 10,
+                                    }}
+                                >
+                                    <Text
+                                        style={{ width: "18%", fontSize: 12 }}
+                                    >
+                                        {getTrans(
+                                            docProps.locale,
+                                            "statement-onbehalf-label"
+                                        )}
+                                        :
+                                    </Text>
+                                    <Text style={styles.questionAnswerWide}>
+                                        {values.hasOwnProperty(
+                                            "representationOnBehalfOf_details"
+                                        )
+                                            ? values.representationOnBehalfOf_details
+                                            : ""}
+                                    </Text>
+                                </View>
+                            ) : (
+                                ""
+                            )}
                         </View>
                     </View>
                 </View>
diff --git a/components/pdftemplates/statement_pdf.js b/components/pdftemplates/statement_pdf.js
index 1a800791..921c340c 100644
--- a/components/pdftemplates/statement_pdf.js
+++ b/components/pdftemplates/statement_pdf.js
@@ -441,24 +441,36 @@ export const statement_pdf = ({ docProps }) => {
                                     </Text>
                                 </View>
                             </View>
-                            <View
-                                wrap={false}
-                                style={{
-                                    flexDirection: "row",
-                                    marginBottom: 10,
-                                }}
-                            >
-                                <Text style={{ width: "18%", fontSize: 12 }}>
-                                    {getTrans(
-                                        docProps.locale,
-                                        "statement-onbehalf-label"
-                                    )}
-                                    :
-                                </Text>
-                                <Text style={styles.questionAnswerWide}>
-                                    {values.representationCapacity}
-                                </Text>
-                            </View>
+                            {values.hasOwnProperty(
+                                "representationOnBehalfOf_details"
+                            ) ? (
+                                <View
+                                    wrap={false}
+                                    style={{
+                                        flexDirection: "row",
+                                        marginBottom: 10,
+                                    }}
+                                >
+                                    <Text
+                                        style={{ width: "18%", fontSize: 12 }}
+                                    >
+                                        {getTrans(
+                                            docProps.locale,
+                                            "statement-onbehalf-label"
+                                        )}
+                                        :
+                                    </Text>
+                                    <Text style={styles.questionAnswerWide}>
+                                        {values.hasOwnProperty(
+                                            "representationOnBehalfOf_details"
+                                        )
+                                            ? values.representationOnBehalfOf_details
+                                            : ""}
+                                    </Text>
+                                </View>
+                            ) : (
+                                ""
+                            )}
                         </View>
                     </View>
                 </View>