diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 3e002ab8e..d81582eff 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -762,7 +762,8 @@ void ApiWrap::gotStickerSet(uint64 setId, const MTPmessages_StickerSet &result)
 		}
 	}
 	if (pack.isEmpty()) {
-		cRefStickerSetsOrder().removeOne(setId);
+		int32 removeIndex = cStickerSetsOrder().indexOf(setId);
+		if (removeIndex >= 0) cRefStickerSetsOrder().removeAt(removeIndex);
 		sets.erase(it);
 	} else {
 		it->stickers = pack;
diff --git a/Telegram/SourceFiles/boxes/stickersetbox.cpp b/Telegram/SourceFiles/boxes/stickersetbox.cpp
index 64908c66e..00be7f414 100644
--- a/Telegram/SourceFiles/boxes/stickersetbox.cpp
+++ b/Telegram/SourceFiles/boxes/stickersetbox.cpp
@@ -105,7 +105,8 @@ void StickerSetInner::installDone(const MTPBool &result) {
 	StickerSets::iterator custom = sets.find(CustomStickerSetId);
 	if (custom != sets.cend()) {
 		for (int32 i = 0, l = _pack.size(); i < l; ++i) {
-			custom->stickers.removeOne(_pack.at(i));
+			int32 removeIndex = custom->stickers.indexOf(_pack.at(i));
+			if (removeIndex >= 0) custom->stickers.removeAt(removeIndex);
 		}
 		if (custom->stickers.isEmpty()) {
 			sets.erase(custom);
@@ -846,7 +847,8 @@ void StickersBox::onSave() {
 					it->flags |= MTPDstickerSet::flag_disabled;
 				} else {
 					_disenableRequests.insert(MTP::send(MTPmessages_UninstallStickerSet(setId), rpcDone(&StickersBox::disenableDone), rpcFail(&StickersBox::disenableFail), 0, 5), NullType());
-					cRefStickerSetsOrder().removeOne(it->id);
+					int32 removeIndex = cStickerSetsOrder().indexOf(it->id);
+					if (removeIndex >= 0) cRefStickerSetsOrder().removeAt(removeIndex);
 					sets.erase(it);
 				}
 			}
diff --git a/Telegram/SourceFiles/dropdown.cpp b/Telegram/SourceFiles/dropdown.cpp
index 47345b687..3655369f3 100644
--- a/Telegram/SourceFiles/dropdown.cpp
+++ b/Telegram/SourceFiles/dropdown.cpp
@@ -2668,7 +2668,8 @@ void EmojiPan::onRemoveSetSure() {
 			}
 		}
 		cRefStickerSets().erase(it);
-		cRefStickerSetsOrder().removeOne(_removingSetId);
+		int32 removeIndex = cStickerSetsOrder().indexOf(_removingSetId);
+		if (removeIndex >= 0) cRefStickerSetsOrder().removeAt(removeIndex);
 		cSetStickersHash(stickersCountHash());
 		refreshStickers();
 		Local::writeStickers();
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index d0c7bad89..f95392a5f 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -4626,7 +4626,8 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 				StickerSets::iterator custom = sets.find(CustomStickerSetId);
 				if (custom != sets.cend()) {
 					for (int32 i = 0, l = pack.size(); i < l; ++i) {
-						custom->stickers.removeOne(pack.at(i));
+						int32 removeIndex = custom->stickers.indexOf(pack.at(i));
+						if (removeIndex >= 0) custom->stickers.removeAt(removeIndex);
 					}
 					if (custom->stickers.isEmpty()) {
 						sets.erase(custom);