diff --git a/package.json b/package.json
index 8e2d0f0f..59dcdc90 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "glass",
     "description": "DHIS2 Glass App",
-    "version": "1.6.18",
+    "version": "1.6.19",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
diff --git a/src/domain/usecases/data-entry/egasp/CustomValidationForEventProgram.ts b/src/domain/usecases/data-entry/egasp/CustomValidationForEventProgram.ts
index 55ddbed2..9a90eb3a 100644
--- a/src/domain/usecases/data-entry/egasp/CustomValidationForEventProgram.ts
+++ b/src/domain/usecases/data-entry/egasp/CustomValidationForEventProgram.ts
@@ -95,7 +95,9 @@ export class CustomValidationForEventProgram {
         countryName: string,
         checkClinics: boolean
     ): FutureData<ConsistencyError[]> {
-        const clinicsInEvents = events.map(e => e.orgUnit);
+        const clinicsInEvents = _(events.map(e => e.orgUnit))
+            .uniq()
+            .value();
         return Future.joinObj({
             clinicsInCountry: checkClinics
                 ? this.metadataRepository.getClinicsAndLabsInOrgUnitId(countryId)
diff --git a/src/webapp/pages/app/App.tsx b/src/webapp/pages/app/App.tsx
index d0f259e9..ea91e9a4 100644
--- a/src/webapp/pages/app/App.tsx
+++ b/src/webapp/pages/app/App.tsx
@@ -40,7 +40,7 @@ export const App: React.FC<AppProps> = React.memo(function App({ api, d2, instan
 
             setAppContext({ api, currentUser, compositionRoot, instance: instance, allCountries: allCountries ?? [] });
             // setShowShareButton(isShareButtonVisible);
-            initFeedbackTool(d2, appConfig);
+            if (process.env.NODE_ENV !== "production") initFeedbackTool(d2, appConfig);
             setLoading(false);
         }
         setup();