diff --git a/bsmd.database/WAS_RCPT.cs b/bsmd.database/WAS_RCPT.cs
index 055478a1..5d93f167 100644
--- a/bsmd.database/WAS_RCPT.cs
+++ b/bsmd.database/WAS_RCPT.cs
@@ -120,6 +120,7 @@ namespace bsmd.database
             foreach (string wasteCode in WAS.WasteCodes)
             {
                 WasteReceived foundWasteReceived = null;
+
                 foreach (WasteReceived wasteReceived in this.WasteReceived)
                 {
                     if (!wasteReceived.WasteCode.IsNullOrEmpty() && wasteReceived.WasteCode.Equals(wasteCode))
@@ -128,16 +129,22 @@ namespace bsmd.database
                         break;
                     }
                 }
+
                 if (foundWasteReceived == null)
                 {
-                    WasteReceived newWasteReceived = new WasteReceived
+                    foundWasteReceived = new WasteReceived
                     {
                         Identifier = DatabaseEntity.GetNewIdentifier(this.WasteReceived),
-                        WAS_RCPT = this,                        
+                        WAS_RCPT = this,
                         AmountWasteReceived_MTQ = 0,
                         WasteCode = wasteCode
                     };
-                    switch(wasteCode)
+                    this.WasteReceived.Add(foundWasteReceived);
+                }
+
+                if (foundWasteReceived.WasteDescription.IsNullOrEmpty())
+                {
+                    switch (wasteCode)
                     {
                         case "999":
                         case "201":
@@ -146,14 +153,13 @@ namespace bsmd.database
                         case "204":
                         case "510":
                         case "511":
-                            newWasteReceived.WasteDescription = "-";
+                            foundWasteReceived.WasteDescription = "-";
                             break;
                         default:
-                            newWasteReceived.WasteDescription = "";
+                            foundWasteReceived.WasteDescription = "";
                             break;
                     }
-                    this.WasteReceived.Add(newWasteReceived);
-                }
+                }                  
             }
         }