diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa5acba1..952dd072 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,7 +102,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * webapps/nextcloud: fix misplaced gid attribute
 * webapps/nextcloud: fix missing gid
 * webapps/roundcube & evoadminmail: make roles more idempotent (were failing when played twice)
-* amavis: Add variables for generate "ldap_suffix" 
+* amavis: Add variables for generate "ldap_suffix"
+* proftpd: fix error when no SSH key is provided
 
 ### Removed
 
diff --git a/proftpd/tasks/accounts.yml b/proftpd/tasks/accounts.yml
index 99b036c9..fc97b55b 100644
--- a/proftpd/tasks/accounts.yml
+++ b/proftpd/tasks/accounts.yml
@@ -73,5 +73,6 @@
   when:
     - proftpd_sftp_enable | bool
     - proftpd_sftp_use_publickeys | bool
+    - _proftpd_account.sshkeys is defined
   tags:
     - proftpd