diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 1afc6002d0..9136634540 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -127,10 +127,21 @@ const LLInventoryItem *LLPreview::getItem() const
 	else if (mObjectUUID.isNull())
 	{
 // [SL:KB] - Patch: UI-Notecards | Checked: 2010-09-11 (Catznip-2.1.2d) | Added: Catznip-2.1.2d
-		if (LLInventoryType::IT_NONE == mAuxItem->getInventoryType() && mItemUUID.notNull())
-			item = gInventory.getItem(mItemUUID);
-		else if (!mIsMaterialPreview) // <FS:Ansariel> FIRE-33196: Fix materials upload conflicting with embedded items in notecards fix
-			item = mAuxItem;
+		if (mIsMaterialPreview)
+		{
+			if (mItemUUID.notNull())
+			{
+				// it's an inventory item, so get the item.
+				item = gInventory.getItem(mItemUUID);
+			}
+		}
+		else
+		{
+			if (LLInventoryType::IT_NONE == mAuxItem->getInventoryType())
+				item = gInventory.getItem(mItemUUID);
+			else
+				item = mAuxItem;
+		}
 // [/SL:KB]
         //if (mItemUUID.notNull())
         //{