A method in a network node comprises determining (610) whether at least a first D2D capable UE is or will be performing a D2D operation, and determining whether the at least the first D2D capable UE is or will be performing cellular operation. The method comprises adapting (620) activity and/or inactivity state configurations for the at least the first D2D UE based on the determining.