diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php
index 8486f667..56a76822 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-calendar-details.php
@@ -25,6 +25,7 @@ class SP_Meta_Box_Calendar_Details {
 		$date_from = get_post_meta( $post->ID, 'sp_date_from', true );
 		$date_to = get_post_meta( $post->ID, 'sp_date_to', true );
 		$team_id = get_post_meta( $post->ID, 'sp_team', true );
+		$table_id = get_post_meta( $post->ID, 'sp_table', true );
 		$order = get_post_meta( $post->ID, 'sp_order', true );
 		?>
 		<div>
@@ -77,6 +78,21 @@ class SP_Meta_Box_Calendar_Details {
 				endif;
 				?>
 			</p>
+			<p><strong><?php _e( 'League Table', 'sportspress' ); ?></strong></p>
+			<p>
+				<?php
+				$args = array(
+					'show_option_all' => __( 'All', 'sportspress' ),
+					'post_type' => 'sp_table',
+					'name' => 'sp_table',
+					'selected' => $table_id,
+					'values' => 'ID'
+				);
+				if ( ! sp_dropdown_pages( $args ) ):
+					sp_post_adder( 'sp_table', __( 'Add New', 'sportspress' )  );
+				endif;
+				?>
+			</p>
 			<p><strong><?php _e( 'Sort Order', 'sportspress' ); ?></strong></p>
 			<p>
 				<select name="sp_order">
@@ -98,5 +114,6 @@ class SP_Meta_Box_Calendar_Details {
 		update_post_meta( $post_id, 'sp_date_to', sp_array_value( $_POST, 'sp_date_to', null ) );
 		update_post_meta( $post_id, 'sp_order', sp_array_value( $_POST, 'sp_order', array() ) );
 		update_post_meta( $post_id, 'sp_team', sp_array_value( $_POST, 'sp_team', 0 ) );
+		update_post_meta( $post_id, 'sp_table', sp_array_value( $_POST, 'sp_table', 0 ) );
 	}
 }
\ No newline at end of file
diff --git a/includes/class-sp-calendar.php b/includes/class-sp-calendar.php
index 52f53372..abbbdebd 100644
--- a/includes/class-sp-calendar.php
+++ b/includes/class-sp-calendar.php
@@ -104,6 +104,7 @@ class SP_Calendar extends SP_Custom_Post {
 				$seasons = get_the_terms( $this->ID, 'sp_season' );
 				$venues = get_the_terms( $this->ID, 'sp_venue' );
 				$team = get_post_meta( $this->ID, 'sp_team', true );
+				$table = get_post_meta( $this->ID, 'sp_table', true );
 
 				if ( $leagues ):
 					$league_ids = array();
@@ -150,6 +151,19 @@ class SP_Calendar extends SP_Custom_Post {
 					);
 				endif;
 
+				if ( $table ) :
+					$teams = get_post_meta( $table, 'sp_team' );
+					$teams = array_filter( $teams );
+					
+					$args['meta_query']	= array(
+						array(
+							'key'		=> 'sp_team',
+							'value'		=> $teams,
+							'compare' 	=> 'IN'
+						),
+					);
+				endif;
+
 			endif;
 			
 			$events = get_posts( $args );