diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json
index b95fa7c39..b8e583f5d 100755
--- a/programs/patient-program-config.json
+++ b/programs/patient-program-config.json
@@ -738,7 +738,7 @@
       {
         "uuid": "a2a265dc-508d-4f31-94ee-0bf8a58049d7",
         "name": "HCW/Peer Delivery Visit",
-        "allowedIf": "!isEligibleForCommunityVisit && !isFirstAMPATHHIVVisit",
+        "allowedIf": "!isFirstAMPATHHIVVisit",
         "encounterTypes": [
           {
             "uuid": "987009c6-6f24-43f7-9640-c285d6553c63",
@@ -1992,6 +1992,17 @@
           }
         ]
       },
+      {
+        "uuid": "a2a265dc-508d-4f31-94ee-0bf8a58049d7",
+        "name": "HCW/Peer Delivery Visit",
+        "allowedIf": "!isEligibleForCommunityVisit && !isFirstAMPATHHIVVisit",
+        "encounterTypes": [
+          {
+            "uuid": "987009c6-6f24-43f7-9640-c285d6553c63",
+            "display": "DRUGPICKUP"
+          }
+        ]
+      },
       {
         "uuid": "0ee7598d-2345-4740-8627-f166cf5d3dc5",
         "name": "HIV Mental health screening Visit",