diff --git a/mptcp/files/usr/bin/multipath b/mptcp/files/usr/bin/multipath
index 3e75eb5e7..014c3a8af 100755
--- a/mptcp/files/usr/bin/multipath
+++ b/mptcp/files/usr/bin/multipath
@@ -139,7 +139,7 @@ else
 		done
 	}
 
-        ID=$(ip mptcp endpoint show | sort | grep -m 1 -E "dev $DEVICE " | awk '{print $3}')
+        ID=$(ip mptcp endpoint show | sort | grep "dev $DEVICE " | awk '{print $3}')
         IFF=$(ip mptcp endpoint show | sort | grep -m 1 -E "dev $DEVICE " | awk '{print $4}')
         #IP=$(ip a show $DEVICE | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p')
         [ -f /usr/bin/jsonfilter ] && IP=$(ip -j a show $DEVICE | jsonfilter -e '@[0].addr_info[*].local')
diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index 75dc32ea2..7f185d395 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -292,6 +292,9 @@ while true; do
 				if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
 					OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -m 1 default | awk '/via/ {print $3}' | tr -d "\n")
 				fi
+				if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
+					OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | awk '/via/ {print $3}' | tr -d "\n")
+				fi
 			fi
 			if [ "$OMR_TRACKER_IPV6" = "1" ] || [ "$OMR_TRACKER_IPV6" = "auto" ]; then
 				#OMR_TRACKER_DEVICE_IP6=$(ip -6 -br addr ls dev "$OMR_TRACKER_DEVICE" | awk -F'[ /]+' '{print $3}')