diff --git a/includes/admin/settings/class-sp-settings-events.php b/includes/admin/settings/class-sp-settings-events.php
index 4a1e6143..050ffaa1 100644
--- a/includes/admin/settings/class-sp-settings-events.php
+++ b/includes/admin/settings/class-sp-settings-events.php
@@ -5,7 +5,7 @@
  * @author 		ThemeBoy
  * @category 	Admin
  * @package 	SportsPress/Admin
- * @version     0.8.6
+ * @version     1.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
@@ -109,6 +109,14 @@ class SP_Settings_Events extends SP_Settings_Page {
 				'type' 		=> 'checkbox',
 			),
 
+			array(
+				'title'     => __( 'Venues', 'sportspress' ),
+				'desc' 		=> __( 'Link venues', 'sportspress' ),
+				'id' 		=> 'sportspress_calendar_link_venues',
+				'default'	=> 'yes',
+				'type' 		=> 'checkbox',
+			),
+
 			array(
 				'title'     => __( 'Pagination', 'sportspress' ),
 				'desc' 		=> __( 'Paginate', 'sportspress' ),
diff --git a/templates/event-list.php b/templates/event-list.php
index e19519f1..6018314b 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -15,6 +15,7 @@ $defaults = array(
 	'status' => 'default',
 	'number' => -1,
 	'link_teams' => get_option( 'sportspress_calendar_link_teams', 'no' ) == 'yes' ? true : false,
+	'link_venues' => get_option( 'sportspress_calendar_link_venues', 'yes' ) == 'yes' ? true : false,
 	'sortable' => get_option( 'sportspress_enable_sortable_tables', 'yes' ) == 'yes' ? true : false,
 	'responsive' => get_option( 'sportspress_enable_responsive_tables', 'yes' ) == 'yes' ? true : false,
 	'paginated' => get_option( 'sportspress_calendar_paginated', 'yes' ) == 'yes' ? true : false,
@@ -137,7 +138,14 @@ if ( isset( $columns ) )
 
 				if ( $usecolumns == null || in_array( 'venue', $usecolumns ) ):
 					echo '<td class="data-venue">';
-					the_terms( $event->ID, 'sp_venue' );
+					if ( $link_venues ):
+						the_terms( $event->ID, 'sp_venue' );
+					else:
+						$venues = get_the_terms( $event->ID, 'sp_venue' );
+						foreach ( $venues as $venue ):
+							echo $venue->name;
+						endforeach;
+					endif;
 					echo '</td>';
 				endif;