diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 69bc845a..31b82fa1 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1936,10 +1936,10 @@ void do_friends(Messenger *m)
 
                         uint8_t typing = data[0];
 
+                        set_friend_typing(m, i, typing);
+
                         if (m->friend_typingchange)
                             m->friend_typingchange(m, i, typing, m->friend_typingchange_userdata);
-
-                        set_friend_typing(m, i, typing);
                         break;
                     }