diff --git a/configuration/ampathforms/HTS_Initial.json b/configuration/ampathforms/HTS_Initial.json
index 8fc72f26..a357cab4 100644
--- a/configuration/ampathforms/HTS_Initial.json
+++ b/configuration/ampathforms/HTS_Initial.json
@@ -425,7 +425,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "everTested === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(everTested) || everTested === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -554,7 +554,7 @@
               },
               "id": "willingToShareResults",
               "hide": {
-                "hideWhenExpression": "isEmpty(selfTestLastTwelveMonths) || selfTestLastTwelveMonths !== '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(selfTestLastTwelveMonths) || selfTestLastTwelveMonths !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {