diff --git a/vripper-server/src/main/java/tn/mnlr/vripper/download/DownloadJob.java b/vripper-server/src/main/java/tn/mnlr/vripper/download/DownloadJob.java
index de15458..970cf66 100644
--- a/vripper-server/src/main/java/tn/mnlr/vripper/download/DownloadJob.java
+++ b/vripper-server/src/main/java/tn/mnlr/vripper/download/DownloadJob.java
@@ -83,7 +83,7 @@ public class DownloadJob implements CheckedRunnable {
                 if (updatedPost.getDownloadDirectory() == null) {
                     pathService.createDefaultPostFolder(updatedPost);
                 }
-                if (settingsService.getSettings().getLeaveThanksOnStart()) {
+                if (settingsService.getSettings().getLeaveThanksOnStart() != null && settingsService.getSettings().getLeaveThanksOnStart()) {
                     authService.leaveThanks(updatedPost);
                 }
             }