diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index edfaf99c08..e094a04ea3 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3751,6 +3751,7 @@ void ApiWrap::uploadAlbumMedia(
 		const auto item = App::histItemById(localId);
 		if (!item) {
 			failed();
+			return;
 		}
 		if (const auto media = item->media()) {
 			if (const auto photo = media->photo()) {
diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp
index e442b3a998..6196505a1e 100644
--- a/Telegram/SourceFiles/ui/special_buttons.cpp
+++ b/Telegram/SourceFiles/ui/special_buttons.cpp
@@ -210,7 +210,7 @@ void EmojiButton::setLoading(bool loading) {
 	}
 	if (loading) {
 		_loading->start();
-	} else {
+	} else if (_loading) {
 		_loading->stop();
 	}
 }