diff --git a/src/packages/fff/fff-babel-bird2/files/lib/functions/fff/babeldaemon/bird2 b/src/packages/fff/fff-babel-bird2/files/lib/functions/fff/babeldaemon/bird2
index 83ac2726..866478bd 100644
--- a/src/packages/fff/fff-babel-bird2/files/lib/functions/fff/babeldaemon/bird2
+++ b/src/packages/fff/fff-babel-bird2/files/lib/functions/fff/babeldaemon/bird2
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
+babel_get_version() {
+	/usr/sbin/bird --version 2>&1 | sed "s/BIRD version /bird-/"
+}
+
 babel_add_interface() {
 	[ "$#" -ne "4" ] && return 1
 
diff --git a/src/packages/fff/fff-babeld/files/lib/functions/fff/babeldaemon/babeld b/src/packages/fff/fff-babeld/files/lib/functions/fff/babeldaemon/babeld
index 75bc47b6..e5427dae 100644
--- a/src/packages/fff/fff-babeld/files/lib/functions/fff/babeldaemon/babeld
+++ b/src/packages/fff/fff-babeld/files/lib/functions/fff/babeldaemon/babeld
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
+babel_get_version() {
+	/usr/sbin/babeld -V 2>&1
+}
+
 babel_add_interface() {
 	[ "$#" -ne "4" ] && return 1
 
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
index 34ba16c8..b0bb74a0 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
+++ b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
@@ -74,10 +74,12 @@ if [ -x /usr/bin/fastd ]; then
 	SYSTEM_DATA="$SYSTEM_DATA<fastd_version>$(/usr/bin/fastd -v | awk '{ print $2 }')</fastd_version>"
 fi
 
-if [ -x /usr/sbin/babeld ]; then
-	SYSTEM_DATA="$SYSTEM_DATA<babel_version>$(/usr/sbin/babeld -V 2>&1)</babel_version>"
-elif [ -x /usr/sbin/bird ]; then
-	SYSTEM_DATA="$SYSTEM_DATA<babel_version>$(/usr/sbin/bird --version 2>&1 | sed "s/BIRD version /bird-/")</babel_version>"
+if [ -e /lib/functions/fff/babel ]; then
+	. /lib/functions/fff/babel
+	babel_version=$(babel_get_version)
+	if [ $? -eq 0 ]; then
+		SYSTEM_DATA="$SYSTEM_DATA<babel_version>$babel_version</babel_version>"
+	fi
 fi
 
 # example for /etc/openwrt_release: