diff --git a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
index 5f044664e..4e0c3ec4e 100644
--- a/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_antenatal_v1.0.json
@@ -283,7 +283,7 @@
                 {
                   "intent":"*",
                   "required":"true",
-                  "readonly": "mode == 'edit' && isEmpty(latest_hiv_test_status) && isEmpty(hiv_test) ? true : false",
+                  "readonly": "mode == 'edit' && isEmpty(latest_hiv_test_status) || mode == 'edit' && isEmpty(hiv_test) ? true : false",
                   "hide":{
                     "hideWhenExpression":"latest_hiv_test_result == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_hiv_test_status == '8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   }
diff --git a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
index 52fe068d5..4b43bce62 100644
--- a/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_labour_and_delivery_v1.0.json
@@ -244,7 +244,7 @@
                 {
                   "intent":"*",
                   "required":"true",
-                  "readonly": "mode == 'edit' && isEmpty(latest_hiv_test_status) || isEmpty(anc_hiv_test_status) ? true : false",
+                  "readonly": "mode == 'edit' && isEmpty(latest_hiv_test_status) || mode == 'edit' &&  isEmpty(anc_hiv_test_status) ? true : false",
                   "hide":{
                     "hideWhenExpression":"anc_latest_hiv_test_result == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   }
diff --git a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
index e6aea9cce..5255d7ee0 100644
--- a/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
+++ b/distro/configuration/ampathforms/pmtct_mother_postnatal_v1.0.json
@@ -239,7 +239,7 @@
                 {
                   "intent":"*",
                   "required":"true",
-                  "readonly": "mode == 'edit' && !isEmpty(latest_hiv_test_status) || isEmpty(hiv_test_status_pnc) ? true : false",
+                  "readonly": "mode == 'edit' && !isEmpty(latest_hiv_test_status) || mode == 'edit' && isEmpty(hiv_test_status_pnc) ? true : false",
                   "hide":{
                     "hideWhenExpression":"testStatusAtANC == '8b8951a8-e8d6-40ca-ad70-89e8f8f71fa8' || ancHivTestResult == '138571AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || latest_art_initiation == '160120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   },