diff --git a/files/lib/gluon/ssid-changer/emergency.sh b/files/lib/gluon/ssid-changer/emergency.sh
index b4ab508bcda0883a8de1af20715d777eb2258e4f..f768ceba0c8cc1cd5b536f81481e8f45bed36827 100755
--- a/files/lib/gluon/ssid-changer/emergency.sh
+++ b/files/lib/gluon/ssid-changer/emergency.sh
@@ -12,7 +12,7 @@ echo 900 > /proc/$(pgrep ntp)/oom_score_adj # ntp
 echo 950 > /proc/$(pgrep /usr/sbin/batadv-vis)/oom_score_adj # batvis
 
 # if we see bat GW just exit
-netz=$(batctl gwl -H|wc -l)
+netz=$(batctl gwl -H|grep -v "gateways in range"|wc -l)
 if [ $netz -ne 0 ] ; then 
         echo "$0 found GW in network, exiting"|logger
         echo 0 > /tmp/emergency
diff --git a/files/lib/gluon/ssid-changer/ssid-changer.sh b/files/lib/gluon/ssid-changer/ssid-changer.sh
index 591916fd3f9911d023e9c5cfb8fa11eb0770939a..22c47226374d283754450aff7f54e0ee200d0642 100755
--- a/files/lib/gluon/ssid-changer/ssid-changer.sh
+++ b/files/lib/gluon/ssid-changer/ssid-changer.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # maximum simplyfied, no more ttvn rating
-check=$(batctl gwl -H|wc -l)
+check=$(batctl gwl -H|grep -v "gateways in range"|wc -l)
 name=$(nodename status|tail -c 21)
 offline="FF_OFFLINE_"
 default="freiburg.freifunk.net"