diff --git a/gobex/gobex.c b/gobex/gobex.c
index 880ed91..4185ed1 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -1016,6 +1016,8 @@ static void auth_challenge(GObex *obex)
 
 	/* Remove it as pending and add it back to the queue so it gets sent
 	 * again */
+	g_source_remove(p->timeout);
+	p->timeout_id = 0;
 	obex->pending_req = NULL;
 	g_obex_send_internal(obex, p, NULL);
 }