diff --git a/source/BackgroundServiceDelegate.mc b/source/BackgroundServiceDelegate.mc
index 36867bc..b76e38a 100644
--- a/source/BackgroundServiceDelegate.mc
+++ b/source/BackgroundServiceDelegate.mc
@@ -106,14 +106,14 @@ class BackgroundServiceDelegate extends System.ServiceDelegate {
                 var activity     = Activity.getProfileInfo().sport;
                 var sub_activity = Activity.getProfileInfo().subSport;
                 // We need to check if we are actually tracking any activity as the enumerated type does not include "No Sport".
-                System.println("activityTrackingOn = " + System.getDeviceSettings().activityTrackingOn);
-                if (!System.getDeviceSettings().activityTrackingOn) {
+                if ((Activity.getActivityInfo() != null) and
+                    ((Activity.getActivityInfo().elapsedTime == null) or
+                     (Activity.getActivityInfo().elapsedTime == 0))) {
                     // Indicate no activity with -1, not part of Garmin's activity codes.
                     // https://developer.garmin.com/connect-iq/api-docs/Toybox/Activity.html#Sport-module
                     activity     = -1;
                     sub_activity = -1;
                 }
-                System.println("activity = " + activity);
                 data.add({
                     "state"     => activity,
                     "type"      => "sensor",
diff --git a/source/WebhookManager.mc b/source/WebhookManager.mc
index c461707..9c69643 100644
--- a/source/WebhookManager.mc
+++ b/source/WebhookManager.mc
@@ -186,10 +186,12 @@ class WebhookManager {
                             // System.println("WebhookManager onReturnRegisterWebhookSensor(): Registering next sensor: Activity");
                             if (Activity has :getProfileInfo) {
                                 var activity = Activity.getProfileInfo().sport;
-                                if (!System.getDeviceSettings().activityTrackingOn) {
+                                if ((Activity.getActivityInfo() != null) and
+                                    ((Activity.getActivityInfo().elapsedTime == null) or
+                                     (Activity.getActivityInfo().elapsedTime == 0))) {
                                     // Indicate no activity with -1, not part of Garmin's activity codes.
                                     // https://developer.garmin.com/connect-iq/api-docs/Toybox/Activity.html#Sport-module
-                                    activity     = -1;
+                                    activity = -1;
                                 }
                                 registerWebhookSensor({
                                     "name"      => "Activity",
@@ -204,7 +206,9 @@ class WebhookManager {
                             // System.println("WebhookManager onReturnRegisterWebhookSensor(): Registering next sensor: Activity");
                             if (Activity has :getProfileInfo) {
                                 var sub_activity = Activity.getProfileInfo().subSport;
-                                if (!System.getDeviceSettings().activityTrackingOn) {
+                                if ((Activity.getActivityInfo() != null) and
+                                    ((Activity.getActivityInfo().elapsedTime == null) or
+                                     (Activity.getActivityInfo().elapsedTime == 0))) {
                                     // Indicate no activity with -1, not part of Garmin's activity codes.
                                     // https://developer.garmin.com/connect-iq/api-docs/Toybox/Activity.html#Sport-module
                                     sub_activity = -1;