diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 2b9607f7a2..a520e0171e 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -2368,7 +2368,11 @@ void LLInventoryModel::buildParentChildMap()
 		}
 		// FIXME note that updateServer() fails with protected
 		// types, so this will not work as intended in that case.
-		cat->updateServer(TRUE);
+		// UpdateServer uses AIS, AIS cat move is not implemented yet
+		// cat->updateServer(TRUE);
+
+		// MoveInventoryFolder message, intentionally per item
+		cat->updateParentOnServer(FALSE);
 		catsp = getUnlockedCatArray(cat->getParentUUID());
 		if(catsp)
 		{