diff --git a/lib/ui/pages/recovery_key/recovery_key.dart b/lib/ui/pages/recovery_key/recovery_key.dart
index 0b506d88..f808f1c3 100644
--- a/lib/ui/pages/recovery_key/recovery_key.dart
+++ b/lib/ui/pages/recovery_key/recovery_key.dart
@@ -83,7 +83,7 @@ class _RecoveryKeyContentState extends State<RecoveryKeyContent> {
         if (_isConfigurationVisible || !keyStatus.exists)
           const RecoveryKeyConfiguration(),
         const SizedBox(height: 16),
-        if (!_isConfigurationVisible && keyStatus.isValid)
+        if (!_isConfigurationVisible && keyStatus.isValid && keyStatus.exists)
           BrandButton.text(
             title: 'recovery_key.key_replace_button'.tr(),
             onPressed: () {
@@ -92,7 +92,7 @@ class _RecoveryKeyContentState extends State<RecoveryKeyContent> {
               });
             },
           ),
-        if (!_isConfigurationVisible && !keyStatus.isValid)
+        if (!_isConfigurationVisible && !keyStatus.isValid && keyStatus.exists)
           FilledButton(
             title: 'recovery_key.key_replace_button'.tr(),
             onPressed: () {
diff --git a/pubspec.yaml b/pubspec.yaml
index 519f9996..71a5f2f9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: selfprivacy
 description: selfprivacy.org
 publish_to: 'none'
-version: 0.5.3+14
+version: 0.6.0+15
 
 environment:
   sdk: '>=2.17.0 <3.0.0'