diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
index 0f9bcd5cc..1737d0495 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
@@ -196,6 +196,7 @@ public class UploadLayout extends VerticalLayout {
 							if (!checkForDuplicate(file.getFileName())) {
 								numberOfFileUploadsExpected.incrementAndGet();
 								file.setStreamVariable(createStreamVariable(file));
+								hasDirectory = Boolean.FALSE;
 							}
 						} else {
 							hasDirectory = Boolean.TRUE;
diff --git a/hawkbit-ui/src/main/resources/messages.properties b/hawkbit-ui/src/main/resources/messages.properties
index 8e785c3db..168920f52 100644
--- a/hawkbit-ui/src/main/resources/messages.properties
+++ b/hawkbit-ui/src/main/resources/messages.properties
@@ -308,7 +308,7 @@ soft.module.os =OS
 message.error.noFileSelected = No file selected for upload
 message.error.noProvidedName = Please provide custom file name
 message.error.noSwModuleSelected = Please select a software module
-message.no.duplicateFiles = duplicate files selected  
+message.no.duplicateFiles = Duplicate files selected  
 message.no.duplicateFile = Duplicate file selected : 
 message.delete.artifact = Are you sure that you want to delete artifact {0} ?
 message.duplicate.filename = Duplicate file name
diff --git a/hawkbit-ui/src/main/resources/messages_de.properties b/hawkbit-ui/src/main/resources/messages_de.properties
index 94a0df4cf..62088946a 100644
--- a/hawkbit-ui/src/main/resources/messages_de.properties
+++ b/hawkbit-ui/src/main/resources/messages_de.properties
@@ -305,7 +305,7 @@ soft.module.os =OS
 message.error.noFileSelected = No file selected for upload
 message.error.noProvidedName = Please provide custom file name
 message.error.noSwModuleSelected = Please select a software module
-message.no.duplicateFiles = duplicate files selected  
+message.no.duplicateFiles = Duplicate files selected  
 message.no.duplicateFile = Duplicate file selected : 
 message.delete.artifact = Are you sure that you want to delete artifact {0} ?
 message.duplicate.filename = Duplicate file name
diff --git a/hawkbit-ui/src/main/resources/messages_en.properties b/hawkbit-ui/src/main/resources/messages_en.properties
index d31ca2af3..075347f12 100644
--- a/hawkbit-ui/src/main/resources/messages_en.properties
+++ b/hawkbit-ui/src/main/resources/messages_en.properties
@@ -299,7 +299,7 @@ soft.module.os =OS
 message.error.noFileSelected = No file selected for upload
 message.error.noProvidedName = Please provide custom file name
 message.error.noSwModuleSelected = Please select a software module
-message.no.duplicateFiles = duplicate files selected  
+message.no.duplicateFiles = Duplicate files selected  
 message.no.duplicateFile = Duplicate file selected : 
 message.delete.artifact = Are you sure that you want to delete artifact {0} ?
 message.duplicate.filename = Duplicate file name