The technology described herein relates to a method in a gateway device and a gateway device for handling a context of a UE moving from a source HeNB (220) to a target HeNB. The gateway device is configured to receive a path switch request message from the source HeNB including a first pair of IDs and the gateway device is configured to transmit a second path switch request message to an MME including a second pair of IDs associated to the first pair of IDs. When the gateway device receives a UE context release request message from the source HeNB, the gateway device determines whether IDs in this message are associated to the same second pair of IDs. If this is the case, the gateway device maintains the UE context otherwise the gateway device releases or de-allocates the UE context.