diff --git a/internal/internal_poller_autoscaler.go b/internal/internal_poller_autoscaler.go
index 139a6efd3..c8dfb299a 100644
--- a/internal/internal_poller_autoscaler.go
+++ b/internal/internal_poller_autoscaler.go
@@ -174,9 +174,9 @@ func (m *pollerUsageEstimator) CollectUsage(data interface{}) error {
 func isTaskEmpty(task interface{}) (bool, error) {
 	switch t := task.(type) {
 	case *workflowTask:
-		return t == nil || isEmptyDecisionTask(t.task), nil
+		return t == nil || t.task == nil || len(t.task.TaskToken) == 0, nil
 	case *activityTask:
-		return t == nil || isEmptyActivityTask(t.task), nil
+		return t == nil || t.task == nil || len(t.task.TaskToken) == 0, nil
 	case *localActivityTask:
 		return t == nil || t.workflowTask == nil, nil
 	default:
diff --git a/internal/internal_utils.go b/internal/internal_utils.go
index 8bb6a5a6f..f3a3695aa 100644
--- a/internal/internal_utils.go
+++ b/internal/internal_utils.go
@@ -492,11 +492,3 @@ func getLengthOfStringPointer(s *string) int {
 	}
 	return len(*s)
 }
-
-func isEmptyDecisionTask(r *s.PollForDecisionTaskResponse) bool {
-	return r == nil || len(r.TaskToken) == 0
-}
-
-func isEmptyActivityTask(r *s.PollForActivityTaskResponse) bool {
-	return r == nil || len(r.TaskToken) == 0
-}