diff --git a/docs/markdown/snowplow_media_player_macro_docs.md b/docs/markdown/snowplow_media_player_macro_docs.md
index 8205c5d..3df0488 100644
--- a/docs/markdown/snowplow_media_player_macro_docs.md
+++ b/docs/markdown/snowplow_media_player_macro_docs.md
@@ -196,3 +196,11 @@ A macro that checks if at least one of the platform enabling variables is true a
 
 {% endraw %}
 {% enddocs %}
+
+{% docs macro_play_time_secs_base_this_run %}
+{% raw %}
+
+A macro for users to optionally configure how the play_time_secs is calculated in the snowplow_media_player_base_this_run table. E.g. to avoid edge cases depending on tracking behaviour.
+
+{% endraw %}
+{% enddocs %}
diff --git a/macros/macros.yml b/macros/macros.yml
index 9bb39e7..f0b50dc 100644
--- a/macros/macros.yml
+++ b/macros/macros.yml
@@ -96,3 +96,6 @@ macros:
 
   - name: config_check
     description: '{{ doc("macro_config_check") }}'
+    
+  - name: play_time_secs_base_this_run
+    description: '{{ doc("macro_play_time_secs_base_this_run") }}'
diff --git a/macros/play_time_secs_base_this_run.sql b/macros/play_time_secs_base_this_run.sql
new file mode 100644
index 0000000..b8333e4
--- /dev/null
+++ b/macros/play_time_secs_base_this_run.sql
@@ -0,0 +1,10 @@
+
+{% macro play_time_secs_base_this_run() %}
+  {{ return(adapter.dispatch('play_time_secs_base_this_run', 'snowplow_media_player')()) }}
+{% endmacro %}
+
+{% macro default__play_time_secs_base_this_run() %}
+
+  coalesce(s.media_session_time_played, d.play_time_secs)
+
+{% endmacro %}
diff --git a/models/media_base/scratch/snowplow_media_player_base_this_run.sql b/models/media_base/scratch/snowplow_media_player_base_this_run.sql
index e4ade89..0964681 100644
--- a/models/media_base/scratch/snowplow_media_player_base_this_run.sql
+++ b/models/media_base/scratch/snowplow_media_player_base_this_run.sql
@@ -195,10 +195,6 @@ events_this_run as (
 
 )
 
-{% set play_time_secs -%}
-  coalesce(s.media_session_time_played, d.play_time_secs)
-{%- endset %}
-
 select
   d.play_id,
   pv.page_view_id,
@@ -235,7 +231,7 @@ select
   ) as avg_playback_rate,
 
   -- time spent
-  {{ play_time_secs }} as play_time_secs,
+  {{ play_time_secs_base_this_run() }} as play_time_secs,
   coalesce(s.media_session_time_played_muted, d.play_time_muted_secs) as play_time_muted_secs,
   s.media_session_time_paused as paused_time_secs,
   s.media_session_time_buffering as buffering_time_secs,
@@ -251,7 +247,7 @@ select
   -- playback progress
   d.plays > 0 as is_played,
   case
-    when {{ play_time_secs }} > {{ var("snowplow__valid_play_sec") }} then true else
+    when {{ play_time_secs_base_this_run() }} > {{ var("snowplow__valid_play_sec") }} then true else
       false
   end as is_valid_play,
   case