diff --git a/config/ninja.php b/config/ninja.php
index e5ad97412c16..979d0c64c3f7 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -3,7 +3,7 @@
 return [
 
     // Marketing links
-    'time_tracker' => env('TIME_TRACKER_URL', 'https://www.invoiceninja.com'),
+    'time_tracker_web_url' => env('TIME_TRACKER_WEB_URL'),
 
     // Hosted plan coupons
     'coupon_50_off' => env('COUPON_50_OFF', false),
diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index 01b13d46c620..228529a65265 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -507,11 +507,11 @@
 			toastr.options.positionClass = 'toast-bottom-right';
 
 			if (navigator.userAgent != 'Time Tracker') {
-				var link = '{{ config('ninja.time_tracker') }}';
+				var link = '{{ config('ninja.time_tracker_web_url') }}';
 				var message = "{{ trans('texts.download_desktop_app') }}";
 				if (isMobile) {
 					toastr.warning("{{ trans('texts.time_tracker_mobile_help')}}", false, {
-						timeOut: 10000,
+						timeOut: 5000,
 						closeButton: true,
 					});
 					if (isIPhone) {
@@ -522,14 +522,16 @@
 						message = "{{ trans('texts.download_android_app') }}";
 					}
 				}
-				var options = {
-					timeOut: 10000,
-					closeButton: true,
-					onclick: function() {
-						window.open(link, '_blank');
-					}
-				};
-				toastr.info(message, false, options);
+				if (link) {
+					var options = {
+						timeOut: 5000,
+						closeButton: true,
+						onclick: function() {
+							window.open(link, '_blank');
+						}
+					};
+					toastr.info(message, false, options);
+				}
 			}
 
 			if (model.isDesktop()) {