diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
index fb8a27a7a..11bbec918 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
@@ -214,22 +214,22 @@ public class BulkUploadHandler extends CustomComponent
                  * below event.
                  */
                 eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_PROCESS_STARTED));
+
                 while ((line = reader.readLine()) != null) {
                     innerCounter++;
                     readEachLine(line, innerCounter, totalFileSize);
                 }
-                doAssignments();
-                eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED));
 
-                // Clearing after assignments are done
-                managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated().clear();
             } catch (final IOException e) {
                 LOG.error("Error reading file {}", tempFile.getName(), e);
             } catch (final RuntimeException e) {
                 Optional.ofNullable(UI.getCurrent()).ifPresent(
                         error -> UI.getCurrent().getErrorHandler().error(new ConnectorErrorEvent(upload, e)));
-                targetBulkUpdateWindowLayout.closePopupAfterFailureAndRefresh();
             } finally {
+                doAssignments();
+                eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED));
+                // Clearing after assignments are done
+                managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated().clear();
                 resetCounts();
                 deleteFile();
             }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java
index 0dbdb1642..f8e273232 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java
@@ -239,15 +239,6 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
         eventBus.publish(this, BulkUploadPopupEvent.CLOSED);
     }
 
-    /**
-     * Close and refresh this component.
-     */
-    public void closePopupAfterFailureAndRefresh() {
-        closePopup();
-        destroy();
-        init();
-    }
-
     /**
      * @return
      */