diff --git a/Telegram/SourceFiles/chat_helpers/stickers.cpp b/Telegram/SourceFiles/chat_helpers/stickers.cpp
index 0db52e76f..df60f785d 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers.cpp
@@ -176,9 +176,17 @@ void UndoInstallLocally(uint64 setId) {
 		LayerOption::KeepOther);
 }
 
-bool IsFaved(not_null<DocumentData*> document) {
-	auto it = Auth().data().stickerSets().constFind(FavedSetId);
-	return (it != Auth().data().stickerSets().cend()) && it->stickers.contains(document);
+bool IsFaved(not_null<const DocumentData*> document) {
+	const auto it = Auth().data().stickerSets().constFind(FavedSetId);
+	if (it == Auth().data().stickerSets().cend()) {
+		return false;
+	}
+	for (const auto sticker : it->stickers) {
+		if (sticker == document) {
+			return true;
+		}
+	}
+	return false;
 }
 
 void CheckFavedLimit(Set &set) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers.h b/Telegram/SourceFiles/chat_helpers/stickers.h
index 7f7337263..d378dfe6e 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers.h
@@ -69,7 +69,7 @@ void ApplyArchivedResult(const MTPDmessages_stickerSetInstallResultArchive &d);
 bool ApplyArchivedResultFake(); // For testing.
 void InstallLocally(uint64 setId);
 void UndoInstallLocally(uint64 setId);
-bool IsFaved(not_null<DocumentData*> document);
+bool IsFaved(not_null<const DocumentData*> document);
 void SetFaved(not_null<DocumentData*> document, bool faved);
 
 void SetsReceived(const QVector<MTPStickerSet> &data, int32 hash);
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 669f70c6f..8f678cfa3 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1000,7 +1000,11 @@ ImagePtr DocumentData::getStickerThumb() {
 
 Data::FileOrigin DocumentData::stickerSetOrigin() const {
 	if (const auto data = sticker()) {
-		return data->setOrigin();
+		if (const auto result = data->setOrigin()) {
+			return result;
+		} else if (Stickers::IsFaved(this)) {
+			return Data::FileOriginStickerSet(Stickers::FavedSetId, 0);
+		}
 	}
 	return Data::FileOrigin();
 }
diff --git a/Telegram/SourceFiles/ui/images.cpp b/Telegram/SourceFiles/ui/images.cpp
index 0cd698b70..697e835d6 100644
--- a/Telegram/SourceFiles/ui/images.cpp
+++ b/Telegram/SourceFiles/ui/images.cpp
@@ -1408,6 +1408,8 @@ StorageImage *getImage(const StorageImageLocation &location, int32 size) {
 	StorageImages::const_iterator i = storageImages.constFind(key);
 	if (i == storageImages.cend()) {
 		i = storageImages.insert(key, new StorageImage(location, size));
+	} else {
+		i.value()->refreshFileReference(location.fileReference());
 	}
 	return i.value();
 }
@@ -1418,11 +1420,14 @@ StorageImage *getImage(const StorageImageLocation &location, const QByteArray &b
 	if (i == storageImages.cend()) {
 		QByteArray bytesArr(bytes);
 		i = storageImages.insert(key, new StorageImage(location, bytesArr));
-	} else if (!i.value()->loaded()) {
-		QByteArray bytesArr(bytes);
-		i.value()->setData(bytesArr);
-		if (!location.isNull()) {
-			Local::writeImage(key, StorageImageSaved(bytes));
+	} else {
+		i.value()->refreshFileReference(location.fileReference());
+		if (!i.value()->loaded()) {
+			QByteArray bytesArr(bytes);
+			i.value()->setData(bytesArr);
+			if (!location.isNull()) {
+				Local::writeImage(key, StorageImageSaved(bytes));
+			}
 		}
 	}
 	return i.value();
diff --git a/Telegram/SourceFiles/ui/images.h b/Telegram/SourceFiles/ui/images.h
index cea3ffc56..4eae6d1b2 100644
--- a/Telegram/SourceFiles/ui/images.h
+++ b/Telegram/SourceFiles/ui/images.h
@@ -153,7 +153,9 @@ public:
 		return _fileReference;
 	}
 	void refreshFileReference(const QByteArray &data) {
-		_fileReference = data;
+		if (!data.isEmpty()) {
+			_fileReference = data;
+		}
 	}
 
 	static StorageImageLocation FromMTP(
@@ -511,6 +513,9 @@ public:
 	const StorageImageLocation &location() const override {
 		return _location;
 	}
+	void refreshFileReference(const QByteArray &data) {
+		_location.refreshFileReference(data);
+	}
 
 protected:
 	void setInformation(int32 size, int32 width, int32 height) override;