diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 808490b5..0f91aed3 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -377,7 +377,8 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			}
 
 			$output = ob_get_clean();
-			return htmlspecialchars_decode( $output );
+			
+			return htmlspecialchars_decode( $output, ENT_NOQUOTES );
 		}