diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index 8ca02e811..7f2665e29 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -701,7 +701,7 @@ t_config_option weechat_options_irc[] =
   { "irc_away_check_max_nicks", N_("max number of nicks for away check"),
     N_("do not check away nicks on channels with high number of nicks (0 = unlimited)"),
     OPTION_TYPE_INT, 0, INT_MAX, 0,
-    NULL, NULL, &cfg_irc_away_check_max_nicks, NULL, &config_change_away_check_max_nicks },
+    NULL, NULL, &cfg_irc_away_check_max_nicks, NULL, &config_change_away_check },
   { "irc_lag_check", N_("interval between two checks for lag"),
     N_("interval between two checks for lag (in seconds)"),
     OPTION_TYPE_INT, 30, INT_MAX, 60,
@@ -1172,18 +1172,6 @@ config_change_away_check ()
     check_away = cfg_irc_away_check * 60;
 }
 
-/*
- * config_change_away_check_max_nicks: called when max nicks for away check
- *                                     is changed
- */
-
-void
-config_change_away_check_max_nicks ()
-{
-    server_remove_away ();
-    check_away = cfg_irc_away_check * 60;
-}
-
 /*
  * config_change_fifo_pipe: called when FIFO pipe is changed
  */
diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h
index 81e140a2d..1e25964b2 100644
--- a/src/common/weeconfig.h
+++ b/src/common/weeconfig.h
@@ -241,7 +241,6 @@ extern void config_change_one_server_buffer ();
 extern void config_change_color ();
 extern void config_change_nicks_colors ();
 extern void config_change_away_check ();
-extern void config_change_away_check_max_nicks ();
 extern void config_change_fifo_pipe ();
 extern void config_change_notify_levels ();
 extern void config_change_log ();
diff --git a/src/irc/irc-channel.c b/src/irc/irc-channel.c
index 2809e518e..fbff9d67d 100644
--- a/src/irc/irc-channel.c
+++ b/src/irc/irc-channel.c
@@ -347,6 +347,8 @@ channel_check_away (t_irc_server *server, t_irc_channel *channel)
             channel->checking_away++;
             server_sendf (server, "WHO %s\r\n", channel->name);
         }
+        else
+            channel_remove_away (channel);
     }
 }
 
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index 8ca02e811..7f2665e29 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -701,7 +701,7 @@ t_config_option weechat_options_irc[] =
   { "irc_away_check_max_nicks", N_("max number of nicks for away check"),
     N_("do not check away nicks on channels with high number of nicks (0 = unlimited)"),
     OPTION_TYPE_INT, 0, INT_MAX, 0,
-    NULL, NULL, &cfg_irc_away_check_max_nicks, NULL, &config_change_away_check_max_nicks },
+    NULL, NULL, &cfg_irc_away_check_max_nicks, NULL, &config_change_away_check },
   { "irc_lag_check", N_("interval between two checks for lag"),
     N_("interval between two checks for lag (in seconds)"),
     OPTION_TYPE_INT, 30, INT_MAX, 60,
@@ -1172,18 +1172,6 @@ config_change_away_check ()
     check_away = cfg_irc_away_check * 60;
 }
 
-/*
- * config_change_away_check_max_nicks: called when max nicks for away check
- *                                     is changed
- */
-
-void
-config_change_away_check_max_nicks ()
-{
-    server_remove_away ();
-    check_away = cfg_irc_away_check * 60;
-}
-
 /*
  * config_change_fifo_pipe: called when FIFO pipe is changed
  */
diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h
index 81e140a2d..1e25964b2 100644
--- a/weechat/src/common/weeconfig.h
+++ b/weechat/src/common/weeconfig.h
@@ -241,7 +241,6 @@ extern void config_change_one_server_buffer ();
 extern void config_change_color ();
 extern void config_change_nicks_colors ();
 extern void config_change_away_check ();
-extern void config_change_away_check_max_nicks ();
 extern void config_change_fifo_pipe ();
 extern void config_change_notify_levels ();
 extern void config_change_log ();
diff --git a/weechat/src/irc/irc-channel.c b/weechat/src/irc/irc-channel.c
index 2809e518e..fbff9d67d 100644
--- a/weechat/src/irc/irc-channel.c
+++ b/weechat/src/irc/irc-channel.c
@@ -347,6 +347,8 @@ channel_check_away (t_irc_server *server, t_irc_channel *channel)
             channel->checking_away++;
             server_sendf (server, "WHO %s\r\n", channel->name);
         }
+        else
+            channel_remove_away (channel);
     }
 }