diff --git a/templates/event-blocks.php b/templates/event-blocks.php
index b00870eb..44334318 100644
--- a/templates/event-blocks.php
+++ b/templates/event-blocks.php
@@ -189,8 +189,11 @@ if ( $title )
 								<div class="sp-event-season"><?php echo $season->name; ?></div>
 							<?php endif; endif; ?>
 							<?php if ( $show_venue ): $venues = get_the_terms( $event, 'sp_venue' ); if ( $venues ): $venue = array_shift( $venues ); ?>
-								<div class="sp-event-venue"><?php echo $venue->name; ?></div>
+								<div class="sp-event-venue" itemprop="location" itemscope itemtype="http://schema.org/Place"><div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress"><?php echo $venue->name; ?></div></div>
 							<?php endif; endif; ?>
+							<?php if ( !$show_venue || !$venues ): ?>
+								<div style="display:none;" class="sp-event-venue" itemprop="location" itemscope itemtype="http://schema.org/Place"><div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress"><?php _e( 'N/A', 'sportspress' ); ?></div></div>
+							<?php endif; ?>
 							<h4 class="sp-event-title" itemprop="name">
 								<?php echo sp_add_link( $event->post_title, $permalink, $link_events ); ?>
 							</h4>
diff --git a/templates/event-list.php b/templates/event-list.php
index 08591483..52b6c2bc 100644
--- a/templates/event-list.php
+++ b/templates/event-list.php
@@ -388,7 +388,8 @@ $identifier = uniqid( 'eventlist_' );
 						endif;
 
 						if ( sp_column_active( $usecolumns, 'venue' ) ):
-							echo '<td class="data-venue" data-label="'.__( 'Venue', 'sportspress' ).'">';
+							echo '<td class="data-venue" data-label="'.__( 'Venue', 'sportspress' ).'" itemprop="location" itemscope itemtype="http://schema.org/Place">';
+							echo '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
 							if ( $link_venues ):
 								the_terms( $event->ID, 'sp_venue' );
 							else:
@@ -397,6 +398,13 @@ $identifier = uniqid( 'eventlist_' );
 									echo $venue->name;
 								endforeach; endif;
 							endif;
+							echo '</div>';
+							echo '</td>';
+						else:
+							echo '<td style="display:none;" class="data-venue" data-label="'.__( 'Venue', 'sportspress' ).'" itemprop="location" itemscope itemtype="http://schema.org/Place">';
+							echo '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
+							_e( 'N/A', 'sportspress' );
+							echo '</div>';
 							echo '</td>';
 						endif;