diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
index 171629a8..7f69a9b5 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
@@ -44,6 +44,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 
 public class ClaimActivity extends ImisActivity {
@@ -236,7 +237,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
         btnPost.setOnClickListener(v -> {
             progressDialog = ProgressDialog.show(this, "", getResources().getString(R.string.Processing));
             runOnNewThread(
-                    () -> isValidData() && saveClaim(),
+                    () -> isValidData() && isValidDiagnosis() && saveClaim(),
                     () -> runOnUiThread(() -> {
                         ClearForm();
                         progressDialog.dismiss();
@@ -793,6 +794,26 @@ protected boolean isValidData() {
         return true;
     }
 
+    private boolean isValidDiagnosis(){
+        List<AutoCompleteTextView> diagnosisList = new ArrayList<>();
+        diagnosisList.add(etDiagnosis);
+        diagnosisList.add(etDiagnosis1);
+        diagnosisList.add(etDiagnosis2);
+        diagnosisList.add(etDiagnosis3);
+        diagnosisList.add(etDiagnosis4);
+
+        for(AutoCompleteTextView diagnosis : diagnosisList){
+            if(!diagnosis.getText().toString().isEmpty()){
+                String name = sqlHandler.getReferenceName(diagnosis.getText().toString());
+                if(name.equals(getResources().getString(R.string.Unknown))){
+                    showValidationDialog(diagnosis, getResources().getString(R.string.invalidDisease));
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     protected boolean isValidInsureeNumber() {
         Escape escape = new Escape();
         return escape.CheckCHFID(etInsureeNumber.getText().toString());
diff --git a/claimManagement/src/main/res/values-fr/strings.xml b/claimManagement/src/main/res/values-fr/strings.xml
index b1300bb1..f6d08d31 100644
--- a/claimManagement/src/main/res/values-fr/strings.xml
+++ b/claimManagement/src/main/res/values-fr/strings.xml
@@ -221,4 +221,5 @@
   <string name="NoItemsPricelist">La formation sanitaire n\'a pas de liste de prix pour les produits </string>
   <string name="entered">Entrée</string>
   <string name="News">Nouveautés:</string>
+  <string name="invalidDisease">Code de diagnostic invalide</string>
 </resources>
diff --git a/claimManagement/src/main/res/values/strings.xml b/claimManagement/src/main/res/values/strings.xml
index 9e4c04d2..494183fe 100644
--- a/claimManagement/src/main/res/values/strings.xml
+++ b/claimManagement/src/main/res/values/strings.xml
@@ -256,4 +256,5 @@
     <string name="NoServicesPricelist">This healthfacility don\'t have services pricelist</string>
     <string name="NoItemsPricelist">This healthfacility don\'t have items pricelist</string>
     <string name="News">New changes:</string>
+    <string name="invalidDisease">Invalid disease code</string>
 </resources>