diff --git a/src/controller.cpp b/src/controller.cpp
index 0e5a00e91..f7e8cac0d 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -341,15 +341,9 @@ bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const
 void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
 {
     auto job = conn->uploadFile(localFile.toLocalFile());
-#ifdef QUOTIENT_07
-    if (isJobPending(job)) {
-#else
-    if (isJobRunning(job)) {
-#endif
-        connect(job, &BaseJob::success, this, [conn, job] {
-            conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
-        });
-    }
+    connect(job, &BaseJob::success, this, [conn, job] {
+        conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
+    });
 }
 
 void Controller::markAllMessagesAsRead(Connection *conn)
diff --git a/src/models/customemojimodel.cpp b/src/models/customemojimodel.cpp
index d0e56d708..6428f0f39 100644
--- a/src/models/customemojimodel.cpp
+++ b/src/models/customemojimodel.cpp
@@ -16,12 +16,6 @@
 
 using namespace Quotient;
 
-#ifdef QUOTIENT_07
-#define running isJobPending
-#else
-#define running isJobRunning
-#endif
-
 void CustomEmojiModel::fetchEmojis()
 {
     if (!Controller::instance().activeConnection()) {
@@ -62,37 +56,35 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)
 
     auto job = Controller::instance().activeConnection()->uploadFile(location.toLocalFile());
 
-    if (running(job)) {
-        connect(job, &BaseJob::success, this, [name, location, job] {
-            const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
-            auto json = data != nullptr ? data->contentJson() : QJsonObject();
-            auto emojiData = json["images"].toObject();
+    connect(job, &BaseJob::success, this, [name, location, job] {
+        const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
+        auto json = data != nullptr ? data->contentJson() : QJsonObject();
+        auto emojiData = json["images"].toObject();
 
-            QString url;
+        QString url;
 #ifdef QUOTIENT_07
-            url = job->contentUri().toString();
+        url = job->contentUri().toString();
 #else
-            url = job->contentUri();
+        url = job->contentUri();
 #endif
 
-            QImage image(location.toLocalFile());
-            QJsonObject imageInfo;
-            imageInfo["w"] = image.width();
-            imageInfo["h"] = image.height();
-            imageInfo["mimetype"] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
-            imageInfo["size"] = image.sizeInBytes();
+        QImage image(location.toLocalFile());
+        QJsonObject imageInfo;
+        imageInfo["w"] = image.width();
+        imageInfo["h"] = image.height();
+        imageInfo["mimetype"] = QMimeDatabase().mimeTypeForFile(location.toLocalFile()).name();
+        imageInfo["size"] = image.sizeInBytes();
 
-            emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
-                {QStringLiteral("url"), url},
-                {QStringLiteral("info"), imageInfo},
-                {QStringLiteral("body"), location.fileName()},
-                {"usage"_ls, "emoticon"_ls},
-            });
-
-            json["images"] = emojiData;
-            Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
+        emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
+            {QStringLiteral("url"), url},
+            {QStringLiteral("info"), imageInfo},
+            {QStringLiteral("body"), location.fileName()},
+            {"usage"_ls, "emoticon"_ls},
         });
-    }
+
+        json["images"] = emojiData;
+        Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
+    });
 }
 
 void CustomEmojiModel::removeEmoji(const QString &name)