diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index a6658e92f..716ef6e02 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -151,7 +151,11 @@ void LanDeviceLink::setPairStatus(PairStatus status)
 }
 
 bool LanDeviceLink::linkShouldBeKeptAlive() {
+
+    return true;     //FIXME: Current implementation is broken, so for now we will keep links always established
+
     //We keep the remotely initiated connections, since the remotes require them if they want to request
     //pairing to us, or connections that are already paired. TODO: Keep connections in the process of pairing
-    return (mConnectionSource == ConnectionStarted::Remotely || pairStatus() == Paired);
+    //return (mConnectionSource == ConnectionStarted::Remotely || pairStatus() == Paired);
+
 }