diff --git a/internal/compatibility/proto/response.go b/internal/compatibility/proto/response.go
index 64698e4d9..83dd79e64 100644
--- a/internal/compatibility/proto/response.go
+++ b/internal/compatibility/proto/response.go
@@ -210,6 +210,7 @@ func PollForActivityTaskResponse(t *shared.PollForActivityTaskResponse) *apiv1.P
 		WorkflowType:               WorkflowType(t.WorkflowType),
 		WorkflowDomain:             t.GetWorkflowDomain(),
 		Header:                     Header(t.Header),
+		AutoConfigHint:             AutoConfigHint(t.AutoConfigHint),
 	}
 }
 
@@ -234,6 +235,7 @@ func PollForDecisionTaskResponse(t *shared.PollForDecisionTaskResponse) *apiv1.P
 		Queries:                   WorkflowQueryMap(t.Queries),
 		NextEventId:               t.GetNextEventId(),
 		TotalHistoryBytes:         t.GetTotalHistoryBytes(),
+		AutoConfigHint:            AutoConfigHint(t.AutoConfigHint),
 	}
 }
 
diff --git a/internal/compatibility/proto/types.go b/internal/compatibility/proto/types.go
index b902117a7..69c3b47b4 100644
--- a/internal/compatibility/proto/types.go
+++ b/internal/compatibility/proto/types.go
@@ -77,6 +77,16 @@ func ActivityType(t *shared.ActivityType) *apiv1.ActivityType {
 	}
 }
 
+func AutoConfigHint(t *shared.AutoConfigHint) *apiv1.AutoConfigHint {
+	if t == nil {
+		return nil
+	}
+	return &apiv1.AutoConfigHint{
+		EnableAutoConfig:   t.GetEnableAutoConfig(),
+		PollerWaitTimeInMs: t.GetPollerWaitTimeInMs(),
+	}
+}
+
 func WorkflowType(t *shared.WorkflowType) *apiv1.WorkflowType {
 	if t == nil {
 		return nil
diff --git a/internal/compatibility/testdata/common.go b/internal/compatibility/testdata/common.go
index c6f715960..3567f32fb 100644
--- a/internal/compatibility/testdata/common.go
+++ b/internal/compatibility/testdata/common.go
@@ -208,6 +208,10 @@ var (
 	ActivityLocalDispatchInfoMap = map[string]*apiv1.ActivityLocalDispatchInfo{
 		ActivityID: &ActivityLocalDispatchInfo,
 	}
+	AutoConfigHint = apiv1.AutoConfigHint{
+		EnableAutoConfig:   true,
+		PollerWaitTimeInMs: 100,
+	}
 	TaskListMetadata = apiv1.TaskListMetadata{
 		MaxTasksPerSecond: &gogo.DoubleValue{Value: RatePerSecond},
 	}
diff --git a/internal/compatibility/testdata/service.go b/internal/compatibility/testdata/service.go
index 39658e0a2..a4e38530c 100644
--- a/internal/compatibility/testdata/service.go
+++ b/internal/compatibility/testdata/service.go
@@ -199,6 +199,7 @@ var (
 		StartedTime:               Timestamp2,
 		Queries:                   WorkflowQueryMap,
 		NextEventId:               EventID3,
+		AutoConfigHint:            &AutoConfigHint,
 	}
 	RespondDecisionTaskCompletedRequest = apiv1.RespondDecisionTaskCompletedRequest{
 		TaskToken:                  TaskToken,
@@ -245,6 +246,7 @@ var (
 		WorkflowType:               &WorkflowType,
 		WorkflowDomain:             DomainName,
 		Header:                     &Header,
+		AutoConfigHint:             &AutoConfigHint,
 	}
 	RespondActivityTaskCompletedRequest = apiv1.RespondActivityTaskCompletedRequest{
 		TaskToken: TaskToken,