diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 5811c27d9..25ab0217a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -2126,7 +2126,10 @@ public class DataManagementPlanManager {
                 }
             }
         }
-        Files.deleteIfExists(supportingFilesZip.toPath());
+        if(supportingFilesZip != null) {
+            Files.deleteIfExists(supportingFilesZip.toPath());
+        }
+        Files.deleteIfExists(pdfFile.toPath());
         Files.deleteIfExists(file.getFile().toPath());
 
         return finalDoi;
@@ -2189,6 +2192,7 @@ public class DataManagementPlanManager {
         if(supportingFilesZip != null) {
             Files.deleteIfExists(supportingFilesZip.toPath());
         }
+        Files.deleteIfExists(pdfFile.toPath());
         Files.deleteIfExists(file.getFile().toPath());
 
         return doiModel;
@@ -2216,6 +2220,9 @@ public class DataManagementPlanManager {
             }
         }
         zout.close();
+        if(!hasFileUploaded){
+            Files.deleteIfExists(new File(this.environment.getProperty("temp.temp") + "supportingFiles.zip").toPath());
+        }
         return hasFileUploaded ? new File(this.environment.getProperty("temp.temp") + "supportingFiles.zip") : null;
     }