diff --git a/src/mod_ping.erl b/src/mod_ping.erl
index 88146b14b..e0b4a36a9 100644
--- a/src/mod_ping.erl
+++ b/src/mod_ping.erl
@@ -123,21 +123,22 @@ handle_cast({stop_ping, JID}, State) ->
     Timers = del_timer(JID, State#state.timers),
     {noreply, State#state{timers = Timers}};
 handle_cast({iq_reply, timeout, JID}, State) ->
-    Timers = del_timer(JID, State#state.timers),
     ejabberd_hooks:run(user_ping_timeout, State#state.host,
 		       [JID]),
-    case State#state.timeout_action of
-      kill ->
-	  #jid{user = User, server = Server,
-	       resource = Resource} =
-	      JID,
-	  case ejabberd_sm:get_session_pid(User, Server, Resource)
-	      of
-	    Pid when is_pid(Pid) -> ejabberd_c2s:close(Pid, ping_timeout);
-	    _ -> ok
-	  end;
-      _ -> ok
-    end,
+    Timers = case State#state.timeout_action of
+		 kill ->
+		     #jid{user = User, server = Server,
+			  resource = Resource} =
+			 JID,
+		     case ejabberd_sm:get_session_pid(User, Server, Resource)
+		     of
+			 Pid when is_pid(Pid) -> ejabberd_c2s:close(Pid, ping_timeout);
+			 _ -> ok
+		     end,
+		     del_timer(JID, State#state.timers);
+		 _ ->
+		     State#state.timers
+	     end,
     {noreply, State#state{timers = Timers}};
 handle_cast({iq_reply, #iq{}, _JID}, State) ->
     {noreply, State};