diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index e9f09f9a1..b81d0e63f 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3344,7 +3344,7 @@ void ApiWrap::readFeaturedSetDelayed(uint64 setId) {
 }
 
 void ApiWrap::readFeaturedSets() {
-	auto &sets = _session->data().stickerSetsRef();
+	const auto &sets = _session->data().stickerSets();
 	auto count = _session->data().featuredStickerSetsUnreadCount();
 	QVector<MTPlong> wrappedIds;
 	wrappedIds.reserve(_featuredSetsRead.size());
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 39c8b7264..4402afb0b 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -307,7 +307,7 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 			} else {
 				_setThumbnail = ImageWithLocation();
 			}
-			auto &sets = _controller->session().data().stickerSetsRef();
+			const auto &sets = _controller->session().data().stickerSets();
 			const auto it = sets.find(_setId);
 			if (it != sets.cend()) {
 				const auto set = it->second.get();
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 7cf63db7e..ccd15dfd9 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -497,8 +497,8 @@ QPixmap StickersBox::grabContentCache() {
 }
 
 void StickersBox::installSet(uint64 setId) {
-	auto &sets = _session->data().stickerSetsRef();
-	auto it = sets.find(setId);
+	const auto &sets = _session->data().stickerSets();
+	const auto it = sets.find(setId);
 	if (it == sets.cend()) {
 		rebuildList();
 		return;
@@ -535,8 +535,8 @@ void StickersBox::installDone(const MTPmessages_StickerSetInstallResult &result)
 bool StickersBox::installFail(uint64 setId, const RPCError &error) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
-	auto &sets = _session->data().stickerSetsRef();
-	auto it = sets.find(setId);
+	const auto &sets = _session->data().stickerSets();
+	const auto it = sets.find(setId);
 	if (it == sets.cend()) {
 		rebuildList();
 		return true;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers.cpp b/Telegram/SourceFiles/chat_helpers/stickers.cpp
index 634537a0c..b7e2a7cb7 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers.cpp
@@ -173,8 +173,8 @@ void InstallLocally(uint64 setId) {
 }
 
 void UndoInstallLocally(uint64 setId) {
-	auto &sets = Auth().data().stickerSetsRef();
-	auto it = sets.find(setId);
+	const auto &sets = Auth().data().stickerSets();
+	const auto it = sets.find(setId);
 	if (it == sets.end()) {
 		return;
 	}
@@ -400,7 +400,7 @@ void SetsReceived(const QVector<MTPStickerSet> &data, int32 hash) {
 	}
 	auto writeRecent = false;
 	auto &recent = GetRecentPack();
-	for (auto it = sets.begin(), e = sets.end(); it != e;) {
+	for (auto it = sets.begin(); it != sets.end();) {
 		const auto set = it->second.get();
 		bool installed = (set->flags & MTPDstickerSet::Flag::f_installed_date);
 		bool featured = (set->flags & MTPDstickerSet_ClientFlag::f_featured);
@@ -657,7 +657,7 @@ void FeaturedSetsReceived(
 	}
 
 	auto unreadCount = 0;
-	for (auto it = sets.begin(), e = sets.end(); it != e;) {
+	for (auto it = sets.begin(); it != sets.end();) {
 		const auto set = it->second.get();
 		bool installed = (set->flags & MTPDstickerSet::Flag::f_installed_date);
 		bool featured = (set->flags & MTPDstickerSet_ClientFlag::f_featured);
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index c04e2b05d..3d26a4d70 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -2638,7 +2638,6 @@ std::vector<StickerIcon> StickersListWidget::fillIcons() {
 			result.emplace_back(Stickers::RecentSetId);
 		}
 	}
-	const auto &sets = session().data().stickerSets();
 	for (auto l = _mySets.size(); i != l; ++i) {
 		if (_mySets[i].id == Stickers::MegagroupSetId) {
 			result.emplace_back(Stickers::MegagroupSetId);