diff --git a/src/apps/tftp/tftp_server.c b/src/apps/tftp/tftp_server.c
index 57018bd5..e3f15124 100644
--- a/src/apps/tftp/tftp_server.c
+++ b/src/apps/tftp/tftp_server.c
@@ -428,6 +428,7 @@ void tftp_cleanup(void)
 {
   LWIP_ASSERT("Cleanup called on non-initialized TFTP", tftp_state.upcb != NULL);
   udp_remove(tftp_state.upcb);
+  close_handle();
   memset(&tftp_state, 0, sizeof(tftp_state));
 }