Mercedes pushed Lewis Hamilton's car setup too far in Azerbaijan last weekend and cannot cause him such pain again, the Formula One team's head of strategy said on Wednesday.
The seven-time world champion suffered severe back pain due to wrestling with his bouncing car in Baku and said "he was praying for it to end."
Team boss Toto Wolff raised some concern about Hamilton being able to race in Canada this weekend but strategy boss James Vowles confirmed in a debrief that the driver would compete in Montreal.
"He is an elite athlete that will push the bounds of endurance of himself and the car and that's what Formula One drivers do, that's what makes them exceptional," Vowles said.
"On this occasion though, we pushed the package and our drivers too far, we are putting them into significant discomfort and we simply can't do that again.
"We have a responsibility now to make sure that this doesn't carry on," he added, pointing out other drivers were also suffering.
Hamilton finished fourth in Baku, with George Russell third after both Ferrari drivers retired.
F1 introduced a major rule revamp this season and the changes have caused cars to 'porpoise' -- leaping up and down on the straights as the aerodynamic ground effect is suddenly gained and lost.
Vowles said that there was a difference between porpoising, bouncing and bottoming.
"I'm confident we've made a step forward in terms of porpoising but we very clearly have bouncing and to the outside it looks almost identical, but there is a subtle difference between the two," he added.
Vowles said progress in resolving the porpoising at the Spanish Grand Prix had allowed the team to drop the ride height and run the car lower to the ground, although he added that revealed another problem.
The car was now "hitting the deck" quite hard with the bottoming creating the bouncing evident in Baku.
Vowles said Montreal was not going to be substantially different.
"I think we will still have a package that isn't at the front on merit," he said.
"Red Bull and Ferrari will still be the benchmark that we have to compare ourselves to.
"I think, though, that the large gap that you saw in qualifying in Baku perhaps won't be that big in Montreal."