Problem with EoIP tunnel version 3.11

Ik have a problem with a device that uses a EoIP tunnel. This problem started after I upgraded to version 3.11.
What happens is :
I have two devices. One is connected to the hotspot and the other is in a remote location. The connection between the two connection is acomlished through WiFi.
In the hotspot I can make bindgings for that device based of it’s IP and MAC address. The MAC address seen by the hotspot is the Tunnel MAC address of the remote device and the IP of a bridge this device has.

The problem:
Randomly The hotspot sees this device change it’s MAC address from the Tunnel MAC to the MAC of the WLAN interface of the remote device. This makes the hotspot think that the device goes down every time.

Does anybody know how to fix this ?
I suspect It happens because of a Bridge Reset but I’m not sure

If the EoIP interface is part of a bridge then try setting the admin-mac on the bridge interface.