diff --git a/service/frontend/api/handler.go b/service/frontend/api/handler.go
index fd270ef7899..c9112203a4d 100644
--- a/service/frontend/api/handler.go
+++ b/service/frontend/api/handler.go
@@ -2907,7 +2907,9 @@ func (wh *WorkflowHandler) createPollForDecisionTaskResponse(
 
 	if matchingResp.WorkflowExecution == nil {
 		// this will happen if there is no decision task to be send to worker / caller
-		return &types.PollForDecisionTaskResponse{}, nil
+		return &types.PollForDecisionTaskResponse{
+			AutoConfigHint: matchingResp.AutoConfigHint,
+		}, nil
 	}
 
 	var history *types.History