diff --git a/keystone/templates/bin/_fernet-manage.py.tpl b/keystone/templates/bin/_fernet-manage.py.tpl
index 3fdc1b40b9..019556bf87 100644
--- a/keystone/templates/bin/_fernet-manage.py.tpl
+++ b/keystone/templates/bin/_fernet-manage.py.tpl
@@ -155,6 +155,11 @@ def main():
                  FERNET_DIR)
         write_to_files(secret['data'])
 
+    if args.command == 'credential_setup':
+        if secret.get('data', False):
+            LOG.info('Credential keys already exist, skipping setup...')
+            sys.exit(0)
+
     execute_command(args.command)
 
     LOG.info("Updating data for '%s' secret.", SECRET_NAME)