diff --git a/configuration/ampathforms/PrEP_Behavior_Risk_Assessment_last_six_months.json b/configuration/ampathforms/PrEP_Behavior_Risk_Assessment_last_six_months.json
index 67bb26ae..34477349 100644
--- a/configuration/ampathforms/PrEP_Behavior_Risk_Assessment_last_six_months.json
+++ b/configuration/ampathforms/PrEP_Behavior_Risk_Assessment_last_six_months.json
@@ -230,8 +230,8 @@
 								"rendering": "radio",
 								"concept": "d79488b7-eb63-49ba-b99c-a52f777a1a7f",
 								"calculate": {
-									"calculateExpression": "!isEmpty(PartnerRisk) && String(PartnerRisk) === '5564AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? '138643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : !isEmpty(partnerHivStatus) && String(partnerHivStatus) === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' ? '138643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'  : !isEmpty(behaviourRisks) && String(behaviourRisks) === '159385AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '141814AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '160579AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '156660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '164845AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '7e5eac79-31d5-4a31-a8ee-1b07f824aa67' || 'b19493e4-1a96-4fff-bfc6-3fbca37f02ec' || 'c8ae2850-abab-4b9c-927c-129ecc2c2752' ? '138643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-								},
+									"calculateExpression": "(!isEmpty(PartnerRisk) || !isEmpty(partnerHivStatus) || !isEmpty(behaviourRisks)) && (String(PartnerRisk) === '5564AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || String(partnerHivStatus) === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || (String(behaviourRisks) === '159385AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '141814AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '160579AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '156660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '164845AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || '7e5eac79-31d5-4a31-a8ee-1b07f824aa67' || 'b19493e4-1a96-4fff-bfc6-3fbca37f02ec' || 'c8ae2850-abab-4b9c-927c-129ecc2c2752') ? '138643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' : '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+								  },
 								"answers": [
 									{
 										"concept": "138643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",