diff --git a/assets/js/admin/sportspress-admin.js b/assets/js/admin/sportspress-admin.js
index 4d7641db..c9d8c666 100644
--- a/assets/js/admin/sportspress-admin.js
+++ b/assets/js/admin/sportspress-admin.js
@@ -472,6 +472,9 @@ jQuery(document).ready(function($){
 			
 			// Find the distance between now and the count down date
 			var distance = countDownDate - nowutc;
+			if ( distance < 0 ) {
+				distance = 0;
+			}
 			
 			// Time calculations for days, hours, minutes and seconds
 			var days = Math.floor(distance / (1000 * 60 * 60 * 24));
diff --git a/assets/js/sportspress.js b/assets/js/sportspress.js
index 4bb89dd7..a71d371e 100644
--- a/assets/js/sportspress.js
+++ b/assets/js/sportspress.js
@@ -31,6 +31,9 @@ function sp_viewport() {
 			
 			// Find the distance between now and the count down date
 			var distance = countDownDate - nowutc;
+			if ( distance < 0 ) {
+				distance = 0;
+			}
 			
 			// Time calculations for days, hours, minutes and seconds
 			var days = Math.floor(distance / (1000 * 60 * 60 * 24));
diff --git a/includes/admin/class-sp-admin-dashboard.php b/includes/admin/class-sp-admin-dashboard.php
index ccff7b3f..4a6e307e 100644
--- a/includes/admin/class-sp-admin-dashboard.php
+++ b/includes/admin/class-sp-admin-dashboard.php
@@ -75,7 +75,7 @@ class SP_Admin_Dashboard {
                 $date = new DateTime( $next_event->post_date );
                 $interval = date_diff( $now, $date );
                 ?>
-                <li class="countdown" data-countdown="<?php echo str_replace( '-', '/', get_gmt_from_date( $post->post_date ) ); ?>">
+                <li class="countdown" data-countdown="<?php echo str_replace( '-', '/', get_gmt_from_date( $next_event->post_date ) ); ?>">
                     <a href="<?php echo get_edit_post_link( $next_event->ID ); ?>">
                         <?php printf( __( '<strong>%s</strong> until next event', 'sportspress' ), $interval->days . ' ' . __( 'days', 'sportspress' ) . ' ' . sprintf( '%02s:%02s:%02s', $interval->h, $interval->i, $interval->s ) ); ?>
                         (<?php echo $next_event->post_title; ?>)