diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index f0b593bba758f351aa3fa81690bc7665c2de1aea..13a496b4d785196ac2e33934f1887ddc1a8547e7 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1140,7 +1140,14 @@ LLSD LLInventoryCategory::asAISLLSD() const
     S8 type                 = static_cast<S8>(mPreferredType);
     sd[INV_ASSET_TYPE_LABEL_WS] = type;
     sd[INV_NAME_LABEL] = mName;
-    sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    if (mThumbnailUUID.notNull())
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD().with(INV_ASSET_ID_LABEL, mThumbnailUUID);
+    }
+    else
+    {
+        sd[INV_THUMBNAIL_LABEL] = LLSD();
+    }
 
     return sd;
 }
diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 692ef3b163741e808302fc50926a83f8b01658b8..77212507ab496ffe1237f2eff4d6a6de8b5b911f 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -787,8 +787,16 @@ void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID& new_thumbnail_id
     if (obj->getThumbnailUUID() != new_thumbnail_id)
     {
         LLSD updates;
-        // At the moment server expects id as a string
-        updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id.asString());
+        if (new_thumbnail_id.notNull())
+        {
+            // At the moment server expects id as a string
+            updates["thumbnail"] = LLSD().with("asset_id", new_thumbnail_id.asString());
+        }
+        else
+        {
+            // No thumbnail isntead of 'null id thumbnail'
+            updates["thumbnail"] = LLSD();
+        }
         LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj);
         if (view_folder)
         {