[BACKLOG-832] - Kitchen hangs on MacOS

[BACKLOG-832] - Kitchen hangs on MacOS