Fix/1207 quiet

- [x] Ready to merge

Tasks
- [x] Investigate cause
- [x] Fix #1207