diff --git a/src/util/NuulsUploader.cpp b/src/util/NuulsUploader.cpp
index 05ae31b49..6fd27efc1 100644
--- a/src/util/NuulsUploader.cpp
+++ b/src/util/NuulsUploader.cpp
@@ -106,7 +106,7 @@ void upload(const QMimeData *source, ChannelPtr channel,
     {
         for (const QUrl &path : source->urls())
         {
-            if (getImageFileFormat(path.toLocalFile()) != QString())
+            if (!getImageFileFormat(path.toLocalFile()).isEmpty())
             {
                 channel->addMessage(makeSystemMessage(
                     QString("Uploading image: %1").arg(path.toLocalFile())));
@@ -147,6 +147,7 @@ void upload(const QMimeData *source, ChannelPtr channel,
                 channel->addMessage(makeSystemMessage(
                     QString("Cannot upload file: %1, not an image")
                         .arg(path.toLocalFile())));
+                isUploading = false;
             }
         }
         if (uploadQueue.size())