diff --git a/includes/class-sp-player.php b/includes/class-sp-player.php
index f1f60ed6..58d6efcb 100644
--- a/includes/class-sp-player.php
+++ b/includes/class-sp-player.php
@@ -109,7 +109,7 @@ class SP_Player extends SP_Custom_Post {
 	 * @param bool $admin
 	 * @return array
 	 */
-	public function data( $league_id, $admin = false, $section = -1 ) {
+	public function data( $league_id, $admin = false, $section = -1, $context = null ) {
 
 		$seasons = (array)get_the_terms( $this->ID, 'sp_season' );
 		$metrics = (array)get_post_meta( $this->ID, 'sp_metrics', true );
@@ -500,7 +500,7 @@ class SP_Player extends SP_Custom_Post {
 			if ( $team_id ):
 				$team_name = get_the_title( $team_id );
 				
-				if ( get_option( 'sportspress_link_teams', 'no' ) == 'yes' ? true : false ):
+				if ( 'api' !== $context && get_option( 'sportspress_link_teams', 'no' ) == 'yes' ? true : false ):
 					$team_permalink = get_permalink( $team_id );
 					$team_name = '<a href="' . $team_permalink . '">' . $team_name . '</a>';
 				endif;
@@ -518,10 +518,10 @@ class SP_Player extends SP_Custom_Post {
 
 				// Use static data if key exists and value is not empty, else use placeholder
 				if ( array_key_exists( $season_id, $data ) && array_key_exists( $key, $data[ $season_id ] ) && $data[ $season_id ][ $key ] != '' ):
-					$merged[ $season_id ][ $key ] = $data[ $season_id ][ $key ];
-				else:
-					$merged[ $season_id ][ $key ] = $value;
+					$value = $data[ $season_id ][ $key ];
 				endif;
+				
+				$merged[ $season_id ][ $key ] = $value;
 
 			endforeach;
 
@@ -587,7 +587,7 @@ class SP_Player extends SP_Custom_Post {
 		
 		if ( is_array( $terms ) ) {
 			foreach ( $terms as $term ) {
-				$statistics[ $term->term_id ] = $this->data( $term->term_id );
+				$statistics[ $term->term_id ] = $this->data( $term->term_id, false, -1, 'api' );
 			}
 		}