diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary
index 6d4b4dfd..30d5fe3a 100755
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -2509,7 +2509,10 @@ report_mysql_summary () {
 
    section "Encryption"
    local keyring_plugins="$(collect_keyring_plugins)"
-   local encrypted_tables="$(collect_encrypted_tables)"
+   local encrypted_tables=""
+   if [ ${OPT_LIST_ENCRYPTED_TABLES} == 'yes' ]; then 
+       encrypted_tables="$(collect_encrypted_tables)"
+   fi
 
    format_keyring_plugins "$keyring_plugins" "$encrypted_tables"
    format_encrypted_tables "$encrypted_tables"
@@ -3132,6 +3135,13 @@ short form: -h; type: string
 
 Host to connect to.
 
+=item --list-encrypted-tables
+
+default: false
+
+Include a list of the encrypted tables in all databases. This can cause slowdowns since
+querying Information Schema tables can be slow.
+
 =item --password
 
 short form: -p; type: string
diff --git a/lib/bash/report_mysql_info.sh b/lib/bash/report_mysql_info.sh
index 62ae1586..11776096 100644
--- a/lib/bash/report_mysql_info.sh
+++ b/lib/bash/report_mysql_info.sh
@@ -1567,7 +1567,10 @@ report_mysql_summary () {
 
    section "Encryption"
    local keyring_plugins="$(collect_keyring_plugins)"
-   local encrypted_tables="$(collect_encrypted_tables)"
+   local encrypted_tables=""
+   if [ ${OPT_LIST_ENCRYPTED_TABLES} == 'yes' ]; then 
+       encrypted_tables="$(collect_encrypted_tables)"
+   fi
 
    format_keyring_plugins "$keyring_plugins" "$encrypted_tables"
    format_encrypted_tables "$encrypted_tables"