diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go
index 2a2af6f42..bb3627737 100644
--- a/internal/common/debug/example_test.go
+++ b/internal/common/debug/example_test.go
@@ -42,7 +42,7 @@ type (
 	// activityTrackerImpl implements the ActivityTracker interface
 	activityTrackerImpl struct {
 		sync.RWMutex
-		m map[ActivityInfo]int64
+		activityCount map[ActivityInfo]int64
 	}
 
 	// activityStopperImpl implements the Stopper interface
@@ -58,8 +58,8 @@ var _ Stopper = &activityStopperImpl{}
 
 func (ati *activityTrackerImpl) Start(info ActivityInfo) Stopper {
 	ati.Lock()
-	ati.m[info]++
-	ati.Unlock()
+	defer ati.Unlock()
+	ati.activityCount[info]++
 	return &activityStopperImpl{info: info, tracker: ati}
 }
 
@@ -67,7 +67,7 @@ func (ati *activityTrackerImpl) Stats() Activities {
 	var activities Activities
 	ati.RLock()
 	defer ati.RUnlock()
-	for a, count := range ati.m {
+	for a, count := range ati.activityCount {
 		if count > 0 {
 			activities = append(activities, struct {
 				Info  ActivityInfo
@@ -82,7 +82,10 @@ func (asi *activityStopperImpl) Stop() {
 	asi.Do(func() {
 		asi.tracker.Lock()
 		defer asi.tracker.Unlock()
-		asi.tracker.m[asi.info]--
+		asi.tracker.activityCount[asi.info]--
+		if asi.tracker.activityCount[asi.info] == 0 {
+			delete(asi.tracker.activityCount, asi.info)
+		}
 	})
 }
 
@@ -122,20 +125,16 @@ func Example() {
 	fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats()))
 
 	var activityTracker ActivityTracker
-	activityTracker = &activityTrackerImpl{m: make(map[ActivityInfo]int64)}
+	activityTracker = &activityTrackerImpl{activityCount: make(map[ActivityInfo]int64)}
 
 	info1 := ActivityInfo{
-		WorkflowID:   "id1",
-		RunID:        "rid1",
 		TaskList:     "task-list",
-		ActivityType: "activity",
+		ActivityType: "activity1",
 	}
 
 	info2 := ActivityInfo{
-		WorkflowID:   "id2",
-		RunID:        "rid2",
 		TaskList:     "task-list",
-		ActivityType: "activity",
+		ActivityType: "activity2",
 	}
 
 	stopper1 = activityTracker.Start(info1)
@@ -161,19 +160,15 @@ func Example() {
 	// [
 	//   {
 	//     "Info": {
-	//       "WorkflowID": "id1",
-	//       "RunID": "rid1",
 	//       "TaskList": "task-list",
-	//       "ActivityType": "activity"
+	//       "ActivityType": "activity1"
 	//     },
 	//     "Count": 1
 	//   },
 	//   {
 	//     "Info": {
-	//       "WorkflowID": "id2",
-	//       "RunID": "rid2",
 	//       "TaskList": "task-list",
-	//       "ActivityType": "activity"
+	//       "ActivityType": "activity2"
 	//     },
 	//     "Count": 1
 	//   }
@@ -181,10 +176,8 @@ func Example() {
 	// [
 	//   {
 	//     "Info": {
-	//       "WorkflowID": "id2",
-	//       "RunID": "rid2",
 	//       "TaskList": "task-list",
-	//       "ActivityType": "activity"
+	//       "ActivityType": "activity2"
 	//     },
 	//     "Count": 1
 	//   }
diff --git a/internal/common/debug/types.go b/internal/common/debug/types.go
index 22c978e28..028b2d083 100644
--- a/internal/common/debug/types.go
+++ b/internal/common/debug/types.go
@@ -50,8 +50,6 @@ type (
 	// ActivityInfo contains details on the executing activity
 	// Deprecated: in development and very likely to change
 	ActivityInfo struct {
-		WorkflowID   string
-		RunID        string
 		TaskList     string
 		ActivityType string
 	}
diff --git a/internal/internal_task_handlers.go b/internal/internal_task_handlers.go
index b862e4427..0aa13f085 100644
--- a/internal/internal_task_handlers.go
+++ b/internal/internal_task_handlers.go
@@ -1714,13 +1714,11 @@ func (ath *activityTaskHandlerImpl) Execute(taskList string, t *s.PollForActivit
 			}
 		}()
 	}
-	debugInfo := debug.ActivityInfo{
-		WorkflowID:   *t.WorkflowExecution.WorkflowId,
-		RunID:        *t.WorkflowExecution.RunId,
+	activityInfo := debug.ActivityInfo{
 		TaskList:     ath.taskListName,
 		ActivityType: activityType,
 	}
-	defer ath.activityTracker.Start(debugInfo).Stop()
+	defer ath.activityTracker.Start(activityInfo).Stop()
 	output, err := activityImplementation.Execute(ctx, t.Input)
 
 	dlCancelFunc()
diff --git a/internal/internal_task_pollers.go b/internal/internal_task_pollers.go
index eb0d7f37d..23aa85a31 100644
--- a/internal/internal_task_pollers.go
+++ b/internal/internal_task_pollers.go
@@ -662,13 +662,11 @@ func (lath *localActivityTaskHandler) executeLocalActivityTask(task *localActivi
 
 		laStartTime := time.Now()
 		ctx, span := createOpenTracingActivitySpan(ctx, lath.tracer, time.Now(), task.params.ActivityType, task.params.WorkflowInfo.WorkflowExecution.ID, task.params.WorkflowInfo.WorkflowExecution.RunID)
-		debugInfo := debug.ActivityInfo{
-			WorkflowID:   task.params.WorkflowInfo.WorkflowExecution.ID,
-			RunID:        task.params.WorkflowInfo.WorkflowExecution.RunID,
+		activityInfo := debug.ActivityInfo{
 			TaskList:     task.params.WorkflowInfo.TaskListName,
 			ActivityType: activityType,
 		}
-		defer lath.activityTracker.Start(debugInfo).Stop()
+		defer lath.activityTracker.Start(activityInfo).Stop()
 		defer span.Finish()
 		laResult, err = ae.ExecuteWithActualArgs(ctx, task.params.InputArgs)
 		executionLatency := time.Now().Sub(laStartTime)