Not sure it wil work for you but what I did:
- reboot into trwp
- wipe > advanched > check all but leave internal storage intact (keep unchecked)
- turn off device (yes, without an OS installed) (do not skip this, no idea why, but I had to do this!)
- turn on and reboot into recovery trwp again...