diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpMetadataStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpMetadataStore.java
index 8bc42d116..233157ef3 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpMetadataStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpMetadataStore.java
@@ -123,10 +123,9 @@ public class FileBasedOpenPgpMetadataStore extends AbstractOpenPgpMetadataStore
         if (data == null || data.isEmpty()) {
             if (!destination.exists()) {
                 return;
-            } else {
-                if (!destination.delete()) {
-                    throw new IOException("Cannot delete file " + destination.getAbsolutePath());
-                }
+            }
+            if (!destination.delete()) {
+                throw new IOException("Cannot delete file " + destination.getAbsolutePath());
             }
             return;
         }