diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java
index 976d5ac27..c48dac834 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java
@@ -333,8 +333,12 @@ public class UploadHandler implements StreamVariable, Receiver, SucceededListene
             final SoftwareModule sw = view.getSoftwareModuleSelected();
             view.getFileSelected().remove(new CustomFile(fileName, sw.getName(), sw.getVersion()));
         }
-        view.updateActionCount();
-        infoWindow.uploadFailed(event.getFilename(), failureReason);
+        eventBus.publish(this, UploadArtifactUIEvent.UPLOAD_STREAMINING_FINISHED);
+        if (failureReason != null) {
+            infoWindow.uploadFailed(event.getFilename(), failureReason);
+        } else {
+            infoWindow.uploadFailed(event.getFilename(), event.getReason().getMessage());
+        }
         LOG.info("Upload failed for file :{}", event.getReason());
 
     }