diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/PackageUninstallReceiver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/PackageUninstallReceiver.java
index 5cedf30e0..0957a3c1e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/PackageUninstallReceiver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/PackageUninstallReceiver.java
@@ -11,8 +11,14 @@ public class PackageUninstallReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        String packageName = intent.getData().getEncodedSchemeSpecificPart();
-        Uri appUri = KeychainContract.ApiApps.buildByPackageNameUri(packageName);
-        context.getContentResolver().delete(appUri, null, null);
+        if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(intent.getAction())) {
+            Uri uri = intent.getData();
+            if (uri == null) {
+                return;
+            }
+            String packageName = intent.getData().getEncodedSchemeSpecificPart();
+            Uri appUri = KeychainContract.ApiApps.buildByPackageNameUri(packageName);
+            context.getContentResolver().delete(appUri, null, null);
+        }
     }
 }