1 files changed, 3 insertions, 3 deletions

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index b421cc49d2c..fc866f2e452 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -200,11 +200,11 @@ void batadv_gw_election(struct batadv_priv *bat_priv)
         if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_CLIENT)
                 goto out;
 
-        if (!batadv_atomic_dec_not_zero(&bat_priv->gw_reselect))
-                goto out;
-
         curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
 
+        if (!batadv_atomic_dec_not_zero(&bat_priv->gw_reselect) && curr_gw)
+                goto out;
+
         next_gw = batadv_gw_get_best_gw_node(bat_priv);
 
         if (curr_gw == next_gw)