diff --git a/src/controller.cpp b/src/controller.cpp
index 9eaf3d5d7..07cdddbd1 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -442,7 +442,7 @@ void Controller::playAudio(const QUrl &localFile)
 void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
 {
     auto job = conn->uploadFile(localFile.toLocalFile());
-    if (isJobRunning(job)) {
+    if (isJobPending(job)) {
         connect(job, &BaseJob::success, this, [conn, job] {
             conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
         });
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 75a9a12be..9d022ae3a 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -433,7 +433,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
 void NeoChatRoom::changeAvatar(const QUrl &localFile)
 {
     const auto job = connection()->uploadFile(localFile.toLocalFile());
-    if (isJobRunning(job)) {
+    if (isJobPending(job)) {
         connect(job, &BaseJob::success, this, [this, job] {
             connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}});
         });