diff --git a/openpgp-card/src/card_app.rs b/openpgp-card/src/card_app.rs
index 9e5e6f3..79a516a 100644
--- a/openpgp-card/src/card_app.rs
+++ b/openpgp-card/src/card_app.rs
@@ -529,7 +529,15 @@ impl CardApp {
         key: Box<dyn CardUploadableKey>,
         key_type: KeyType,
     ) -> Result<(), OpenpgpCardError> {
-        let algo_list = self.list_supported_algo()?;
+        let algo_list = self.list_supported_algo();
+
+        let algo_list = if algo_list.is_ok() {
+            algo_list.unwrap()
+        } else {
+            // An error is ok - it's fine if a card doesn't offer a list of
+            // supported algorithms
+            None
+        };
 
         key_upload::upload_key(self, key, key_type, algo_list)
     }
diff --git a/openpgp-card/src/key_upload.rs b/openpgp-card/src/key_upload.rs
index 8866ad5..3c170d7 100644
--- a/openpgp-card/src/key_upload.rs
+++ b/openpgp-card/src/key_upload.rs
@@ -32,10 +32,29 @@ pub(crate) fn upload_key(
             let rsa_bits =
                 (((rsa_key.get_n().len() * 8 + 31) / 32) * 32) as u16;
 
-            // FIXME: deal with absence of algo list (don't just unwrap!)
-            // Get suitable algorithm from card's list
-            let algo =
-                get_card_algo_rsa(algo_list.unwrap(), key_type, rsa_bits);
+            // Get suitable algorithm from card's list, or try to derive it
+            // from the current algo settings on the card
+            let algo = if let Some(algo_list) = algo_list {
+                get_card_algo_rsa(algo_list, key_type, rsa_bits)
+            } else {
+                // Get current settings for this KeyType and adjust the bit
+                // length.
+
+                // FIXME: caching?
+                let ard = card_app.get_app_data()?;
+
+                let algo = CardApp::get_algorithm_attributes(&ard, key_type)?;
+
+                if let Algo::Rsa(mut rsa) = algo {
+                    rsa.len_n = rsa_bits;
+
+                    rsa
+                } else {
+                    // We don't expect a card to support non-RSA algos when
+                    // it can't provide an algorithm list.
+                    unimplemented!("Unexpected: current algo is not RSA");
+                }
+            };
 
             let algo_cmd = rsa_algo_attrs_cmd(key_type, rsa_bits, &algo)?;
             let key_cmd = rsa_key_cmd(key_type, rsa_key, &algo)?;