diff --git a/includes/admin/core/class-admin-builder.php b/includes/admin/core/class-admin-builder.php
index 1580e9f0..1a8ca885 100644
--- a/includes/admin/core/class-admin-builder.php
+++ b/includes/admin/core/class-admin-builder.php
@@ -1055,7 +1055,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
 					}
 
 					$output = '<div class="um-admin-preview-overlay"></div>';
-					$output .= do_shortcode('[ultimatemember form_id="' . $arg1 . '" /]');
+
+					if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+						$output .= do_shortcode('[ultimatemember form_id="' . $arg1 . '" /]');
+					} else {
+						$output .= apply_shortcodes('[ultimatemember form_id="' . $arg1 . '" /]');
+					}
 
 					break;
 
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index c4f55566..a3400441 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -3576,8 +3576,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				case 'shortcode':
 
 					$content = str_replace( '{profile_id}', um_profile_id(), $content );
+					if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+						$content = do_shortcode( $content );
+					} else {
+						$content = apply_shortcodes( $content );
+					}
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . do_shortcode( $content ) . '</div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
 					break;
 
 				/* Unlimited Group */
@@ -4100,8 +4105,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				case 'shortcode':
 
 					$content = str_replace( '{profile_id}', um_profile_id(), $content );
+					if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+						$content = do_shortcode( $content );
+					} else {
+						$content = apply_shortcodes( $content );
+					}
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . do_shortcode( $content ) . '</div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
 					break;
 
 				/* Gap/Space */
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 6042cc83..c1879b52 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -373,7 +373,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 					UM()->get_template( 'login-to-view.php', '', $args, true );
 				}
 			} else {
-				echo do_shortcode( $this->convert_locker_tags( wpautop( $content ) ) );
+				if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+					echo do_shortcode( $this->convert_locker_tags( wpautop( $content ) ) );
+				} else {
+					echo apply_shortcodes( $this->convert_locker_tags( wpautop( $content ) ) );
+				}
 			}
 
 			$output = ob_get_clean();
@@ -397,7 +401,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			if ( is_user_logged_in() ) {
 				echo '';
 			} else {
-				echo do_shortcode( wpautop( $content ) );
+				if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+					echo do_shortcode( wpautop( $content ) );
+				} else {
+					echo apply_shortcodes( wpautop( $content ) );
+				}
 			}
 
 			$output = ob_get_clean();
@@ -430,7 +438,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				$shortcode_attrs .= " {$key}=\"{$value}\"";
 			}
 
-			return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
+			if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+				return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
+			} else {
+				return apply_shortcodes( "[ultimatemember {$shortcode_attrs} /]" );
+			}
 		}
 
 
@@ -459,7 +471,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				$shortcode_attrs .= " {$key}=\"{$value}\"";
 			}
 
-			return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
+			if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+				return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
+			} else {
+				return apply_shortcodes( "[ultimatemember {$shortcode_attrs} /]" );
+			}
 		}
 
 
@@ -489,7 +505,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				$shortcode_attrs .= " {$key}=\"{$value}\"";
 			}
 
-			return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
+			if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+				return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
+			} else {
+				return apply_shortcodes( "[ultimatemember {$shortcode_attrs} /]" );
+			}
 		}
 
 
@@ -519,7 +539,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				$shortcode_attrs .= " {$key}=\"{$value}\"";
 			}
 
-			return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
+			if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+				return do_shortcode( "[ultimatemember {$shortcode_attrs} /]" );
+			} else {
+				return apply_shortcodes( "[ultimatemember {$shortcode_attrs} /]" );
+			}
 		}
 
 
@@ -1144,20 +1168,32 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			$current_user_roles = um_user( 'roles' );
 
 			if ( ! empty( $a['not'] ) && ! empty( $a['roles'] ) ) {
-				return do_shortcode( $this->convert_locker_tags( $content ) );
+				if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+					return do_shortcode( $this->convert_locker_tags( $content ) );
+				} else {
+					return apply_shortcodes( $this->convert_locker_tags( $content ) );
+				}
 			}
 
 			if ( ! empty( $a['not'] ) ) {
 				$not_in_roles = explode( ",", $a['not'] );
 
 				if ( is_array( $not_in_roles ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $not_in_roles ) ) <= 0 ) ) {
-					return do_shortcode( $this->convert_locker_tags( $content ) );
+					if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+						return do_shortcode( $this->convert_locker_tags( $content ) );
+					} else {
+						return apply_shortcodes( $this->convert_locker_tags( $content ) );
+					}
 				}
 			} else {
 				$roles = explode( ",", $a['roles'] );
 
 				if ( ! empty( $current_user_roles ) && is_array( $roles ) && count( array_intersect( $current_user_roles, $roles ) ) > 0 ) {
-					return do_shortcode( $this->convert_locker_tags( $content ) );
+					if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+						return do_shortcode( $this->convert_locker_tags( $content ) );
+					} else {
+						return apply_shortcodes( $this->convert_locker_tags( $content ) );
+					}
 				}
 			}
 
diff --git a/includes/um-deprecated-functions.php b/includes/um-deprecated-functions.php
index 0eae6209..8f8a0eab 100644
--- a/includes/um-deprecated-functions.php
+++ b/includes/um-deprecated-functions.php
@@ -451,7 +451,11 @@ function um_members( $argument ) {
 function um_get_search_form() {
 	//um_deprecated_function( 'um_get_search_form', '2.1.0', 'do_shortcode( \'[ultimatemember_searchform]\' )' );
 
-	return do_shortcode( '[ultimatemember_searchform]' );
+	if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+		return do_shortcode( '[ultimatemember_searchform]' );
+	} else {
+		return apply_shortcodes( '[ultimatemember_searchform]' );
+	}
 }
 
 
diff --git a/includes/widgets/class-um-search-widget.php b/includes/widgets/class-um-search-widget.php
index 4c3da024..4ab48476 100644
--- a/includes/widgets/class-um-search-widget.php
+++ b/includes/widgets/class-um-search-widget.php
@@ -50,7 +50,12 @@ class UM_Search_Widget extends \WP_Widget {
 		}
 
 		// display the search form
-		echo do_shortcode( '[ultimatemember_searchform /]' );
+		if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+			echo do_shortcode( '[ultimatemember_searchform /]' );
+		} else {
+			echo apply_shortcodes( '[ultimatemember_searchform /]' );
+		}
+
 
 		echo $args['after_widget'];
 	}