diff --git a/contrib/apps/ping/ping.c b/contrib/apps/ping/ping.c
index bd0688f3..1d2e8bb9 100644
--- a/contrib/apps/ping/ping.c
+++ b/contrib/apps/ping/ping.c
@@ -401,11 +401,11 @@ ping_raw_stop(void)
 void
 ping_init(const ip_addr_t* ping_addr)
 {
+  ping_stop();
+
   LWIP_ASSERT("ping_target != NULL", ping_target != NULL);
   ping_target = ping_addr;
 
-  ping_stop();
-
 #if PING_USE_SOCKETS
   sys_thread_new("ping_thread", ping_thread, NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
 #else /* PING_USE_SOCKETS */