I believe the problem is the same as

https://github.com/midwan/amiberry/issues/542

I have debugged it and described on the ticket how to fix it so you may not need the workaround soon I hope.