diff --git a/php/classes/repositories/class-episode-repository.php b/php/classes/repositories/class-episode-repository.php
index db4ab8e9..7034e958 100644
--- a/php/classes/repositories/class-episode-repository.php
+++ b/php/classes/repositories/class-episode-repository.php
@@ -256,6 +256,11 @@ public function get_episodes( $atts ) {
 			}
 		}
 
+		// Limit query to only episodes with specified tag(s)
+		if ( $atts['tag'] ) {
+			$query_args['tag'] = $atts['tag'];
+		}
+
 		// Allow dynamic filtering of query args
 		$query_args = apply_filters( 'ssp_podcast_playlist_query_args', $query_args );
 
diff --git a/php/classes/shortcodes/class-podcast-playlist.php b/php/classes/shortcodes/class-podcast-playlist.php
index e51d75cc..397220b4 100644
--- a/php/classes/shortcodes/class-podcast-playlist.php
+++ b/php/classes/shortcodes/class-podcast-playlist.php
@@ -107,6 +107,7 @@ protected function prepare_atts( $params ) {
 			array(
 				'type'         => 'audio',
 				'series'       => '',
+				'tag'          => '',
 				'order'        => 'ASC',
 				'orderby'      => 'menu_order ID',
 				'include'      => '',