diff --git a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/IPPForm/IPPForm.tsx b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/IPPForm/IPPForm.tsx
index 193fee363..51e6c9c11 100644
--- a/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/IPPForm/IPPForm.tsx
+++ b/src/components/CreationCohort/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/IPPForm/IPPForm.tsx
@@ -45,8 +45,7 @@ const IPPForm: React.FC<CriteriaDrawerComponentProps> = (props) => {
   }
 
   useEffect(() => {
-    const ippMatches = (defaultValues.search || '').matchAll(/(?:^|\D+)*(8\d{9})(?:\D+|$)/gm) || []
-
+    const ippMatches = (defaultValues.search || '').matchAll(/(?:^|\D+)?(8\d{9})(?:$|\D+)/gm) || []
     const ippList = []
 
     for (const match of ippMatches) {