diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 3c2f7ebda..fd616f0cd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -428,9 +428,11 @@ public class OpenPgpService extends RemoteService {
                     }
                 }
 
-                OpenPgpMetadata metadata = decryptVerifyResult.getDecryptMetadata();
-                if (metadata != null) {
-                    result.putExtra(OpenPgpApi.RESULT_METADATA, metadata);
+                if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) == 4) {
+                    OpenPgpMetadata metadata = decryptVerifyResult.getDecryptMetadata();
+                    if (metadata != null) {
+                        result.putExtra(OpenPgpApi.RESULT_METADATA, metadata);
+                    }
                 }
 
             } finally {