diff --git a/libretro-common/file/nbio/nbio_stdio.c b/libretro-common/file/nbio/nbio_stdio.c
index 28348c9e4a..6e2a2f6f34 100644
--- a/libretro-common/file/nbio/nbio_stdio.c
+++ b/libretro-common/file/nbio/nbio_stdio.c
@@ -199,4 +199,8 @@ void nbio_free(struct nbio_t* handle)
    }
    fclose(handle->f);
    free(handle->data);
+
+   handle->f    = NULL;
+   handle->data = NULL;
+   free(handle);
 }