Implement spoke workaround

:computer:

Implement spoke workaround.

/cc @maximeprades