diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9f875316102c395077317c67b26fc0f3dc560e4c..c0c4f7837e653f0859857298a46d89e166e50feb 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -204,6 +204,7 @@ Ansariel Hiller
 	MAINT-6744
 	MAINT-6752
 	MAINT-6773
+	MAINT-6906
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 0bbe9fa2c2ab190b0fe133e20315601e3acd3254..434641aa257c998a4b541adbfcc2bec303c8c05e 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1303,12 +1303,18 @@ void update_inventory_item(
     if (updates.has("asset_id"))
     {
         updates.erase("asset_id");
-        updates["hash_id"] = update_item->getTransactionID();
+        if (update_item->getTransactionID().notNull())
+        {
+            updates["hash_id"] = update_item->getTransactionID();
+        }
     }
     if (updates.has("shadow_id"))
     {
         updates.erase("shadow_id");
-        updates["hash_id"] = update_item->getTransactionID();
+        if (update_item->getTransactionID().notNull())
+        {
+            updates["hash_id"] = update_item->getTransactionID();
+        }
     }
     AISAPI::completion_t cr = boost::bind(&doInventoryCb, cb, _1);
     AISAPI::UpdateItem(item_id, updates, cr);