diff --git a/pass/Controllers/PGPKeyArmorSettingTableViewController.swift b/pass/Controllers/PGPKeyArmorSettingTableViewController.swift
index 37a049b..3de63ac 100644
--- a/pass/Controllers/PGPKeyArmorSettingTableViewController.swift
+++ b/pass/Controllers/PGPKeyArmorSettingTableViewController.swift
@@ -148,8 +148,6 @@ extension PGPKeyArmorSettingTableViewController: PGPKeyImporter {
     }
 
     func importKeys() throws {
-        Defaults.pgpKeySource = Self.keySource
-
         try KeyFileManager.PublicPgp.importKey(from: armorPublicKeyTextView.text ?? "")
         try KeyFileManager.PrivatePgp.importKey(from: armorPrivateKeyTextView.text ?? "")
     }
diff --git a/pass/Controllers/PGPKeyFileSettingTableViewController.swift b/pass/Controllers/PGPKeyFileSettingTableViewController.swift
index 763f87a..166ded5 100644
--- a/pass/Controllers/PGPKeyFileSettingTableViewController.swift
+++ b/pass/Controllers/PGPKeyFileSettingTableViewController.swift
@@ -82,8 +82,6 @@ extension PGPKeyFileSettingTableViewController: PGPKeyImporter {
         guard let publicKey = publicKey, let privateKey = privateKey else {
             return
         }
-        Defaults.pgpKeySource = Self.keySource
-
         try KeyFileManager.PublicPgp.importKey(from: publicKey)
         try KeyFileManager.PrivatePgp.importKey(from: privateKey)
     }
diff --git a/pass/Controllers/PGPKeyUrlTableViewController.swift b/pass/Controllers/PGPKeyUrlTableViewController.swift
index 6a95f8a..c42ed20 100644
--- a/pass/Controllers/PGPKeyUrlTableViewController.swift
+++ b/pass/Controllers/PGPKeyUrlTableViewController.swift
@@ -37,10 +37,8 @@ extension PGPKeyUrlTableViewController: PGPKeyImporter {
         return validate(pgpKeyUrl: pgpPublicKeyURLTextField.text)
             && validate(pgpKeyUrl: pgpPrivateKeyURLTextField.text)
     }
-    
-    func importKeys() throws {
-        Defaults.pgpKeySource = Self.keySource
 
+    func importKeys() throws {
         Defaults.pgpPrivateKeyURL = URL(string: pgpPrivateKeyURLTextField.text!.trimmed)
         Defaults.pgpPublicKeyURL = URL(string: pgpPublicKeyURLTextField.text!.trimmed)
 
diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift
index 1cc4b48..c138f5d 100644
--- a/pass/Controllers/SettingsTableViewController.swift
+++ b/pass/Controllers/SettingsTableViewController.swift
@@ -40,6 +40,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
         SVProgressHUD.setDefaultStyle(.light)
         SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())
         DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
+            Defaults.pgpKeySource = type(of: keyImporter).keySource
             do {
                 try keyImporter.importKeys()
                 try PGPAgent.shared.initKeys()
@@ -253,8 +254,6 @@ extension SettingsTableViewController: PGPKeyImporter {
     }
 
     func importKeys() throws {
-        Defaults.pgpKeySource = Self.keySource
-
         try KeyFileManager.PublicPgp.importKeyFromFileSharing()
         try KeyFileManager.PrivatePgp.importKeyFromFileSharing()
     }