diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
index cbcf7e451..a9bb30d40 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainDatabase.java
@@ -32,7 +32,6 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteException;
-import android.support.annotation.VisibleForTesting;
 
 import org.sufficientlysecure.keychain.daos.LocalSecretKeyStorage;
 import org.sufficientlysecure.keychain.provider.KeychainContract.CertsColumns;
@@ -64,6 +63,10 @@ public class KeychainDatabase {
         return sInstance;
     }
 
+    public static KeychainDatabase getTemporaryInstance(Context context) {
+        return new KeychainDatabase(context.getApplicationContext());
+    }
+
     public interface Tables {
         String KEY_RINGS_PUBLIC = "keyrings_public";
         String KEYS = "keys";
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/KeychainExternalProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/KeychainExternalProvider.java
index 85b6979c8..753f198a2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/KeychainExternalProvider.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/KeychainExternalProvider.java
@@ -134,7 +134,7 @@ public class KeychainExternalProvider extends ContentProvider {
 
         String groupBy = null;
 
-        SupportSQLiteDatabase db = KeychainDatabase.getInstance(getContext()).getReadableDatabase();
+        SupportSQLiteDatabase db = KeychainDatabase.getTemporaryInstance(getContext()).getReadableDatabase();
 
         String callingPackageName = apiPermissionHelper.getCurrentCallingPackage();