diff --git a/aioseop_class.php b/aioseop_class.php
index c8d95ab6e..e64b9a1c9 100644
--- a/aioseop_class.php
+++ b/aioseop_class.php
@@ -2534,7 +2534,10 @@ function get_post_description( $post ) {
 				$description = $this->trim_excerpt_without_filters_full_length( $this->internationalize( $post->post_excerpt ) );
 			}
 			if ( ! $description && isset( $aioseop_options['aiosp_generate_descriptions'] ) && $aioseop_options['aiosp_generate_descriptions'] ) {
-				$content = do_shortcode( $post->post_content );
+				if ( ! empty( $aioseop_options['aiosp_run_shortcodes'] ) ) {
+					$content = do_shortcode( $content );
+				}
+				$content     = wp_strip_all_tags( $content );
 				$description = $this->trim_excerpt_without_filters( $this->internationalize( $content ) );
 			}
 		}
diff --git a/all_in_one_seo_pack.php b/all_in_one_seo_pack.php
index 77d5821a3..8fb6ceec8 100644
--- a/all_in_one_seo_pack.php
+++ b/all_in_one_seo_pack.php
@@ -3,7 +3,7 @@
 Plugin Name: All In One SEO Pack
 Plugin URI: https://semperplugins.com/all-in-one-seo-pack-pro-version/
 Description: Out-of-the-box SEO for your WordPress blog. Features like XML Sitemaps, SEO for custom post types, SEO for blogs or business sites, SEO for ecommerce sites, and much more. More than 30 million downloads since 2007.
-Version: 2.3.15.1
+Version: 2.3.15.2
 Author: Michael Torbert
 Author URI: https://semperplugins.com/all-in-one-seo-pack-pro-version/
 Text Domain: all-in-one-seo-pack
@@ -31,14 +31,14 @@
  * The original WordPress SEO plugin.
  *
  * @package All-in-One-SEO-Pack
- * @version 2.3.15.1
+ * @version 2.3.15.2
  */
 
 if ( ! defined( 'AIOSEOPPRO' ) ) {
 	define( 'AIOSEOPPRO', false );
 }
 if ( ! defined( 'AIOSEOP_VERSION' ) ) {
-	define( 'AIOSEOP_VERSION', '2.3.15.1' );
+	define( 'AIOSEOP_VERSION', '2.3.15.2' );
 }
 global $aioseop_plugin_name;
 $aioseop_plugin_name = 'All in One SEO Pack';
diff --git a/modules/aioseop_opengraph.php b/modules/aioseop_opengraph.php
index 047248e1e..a1c42dba7 100644
--- a/modules/aioseop_opengraph.php
+++ b/modules/aioseop_opengraph.php
@@ -755,7 +755,6 @@ function filter_settings( $settings, $location, $current ) {
 							);
 
 					// Add filters
-					$description = do_shortcode( $description );
 					$description = apply_filters( 'aioseop_description', $description );
 					// Add placholders
 					$settings["{$prefix}title"]['placeholder'] = apply_filters( 'aioseop_opengraph_placeholder', $title );
@@ -1190,9 +1189,14 @@ function add_meta() {
 				}
 			}
 
+			if ( ! empty( $this->options['aiosp_opengraph_title_shortcodes'] ) ) {
+				$title = do_shortcode( $title );
+			}
 			if ( ! empty( $description ) ) {
 				$description = $aiosp->internationalize( preg_replace( '/\s+/', ' ', $description ) );
-				$description = do_shortcode( $description );
+				if ( ! empty( $this->options['aiosp_opengraph_description_shortcodes'] ) ) {
+					$description = do_shortcode( $description );
+				}
 				$description = $aiosp->trim_excerpt_without_filters( $description, 1000 );
 			}
 
diff --git a/readme.txt b/readme.txt
index f7f0916d1..b31a526fe 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mrtor
 Tags: seo, all in one seo, google, twitter, page, image seo, social, search engine optimization, sitemap, WordPress SEO, meta, meta description, xml sitemap, google sitemap, sitemaps, robots meta, yahoo, bing, news sitemaps, multisite, canonical, nofollow, noindex, keywords, description, webmaster tools, google webmaster tools, google analytics
 Requires at least: 4.0
 Tested up to: 4.8
-Stable tag: 2.3.15.1
+Stable tag: 2.3.15.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html