Update:
Removed the cassette last night and put it back after looking around and at first it seemed like the issue had been resolved but after some time while I was indexing the gears the freehub started getting caught again.
Sadly I didn't have all the necessary tools to take it apart.
Nonetheless I rode the bike in to work today, the freehub getting caught was annoying but not much of a problem, unless I would start pedaling the moment it happens. The work around was to keep pedalling like a Fixie.
in retrospect I'm thinking the slack in the chain when the freehub gets caught could be dangerous.