diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 215f4db..c6973ae 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -723,16 +723,12 @@ static void open_cfm(struct avdtp *session, struct avdtp_local_sep *sep,
 	if (err) {
 		setup->stream = NULL;
 		setup->err = err;
+		if (setup->start)
+			finalize_resume(setup);
 	}
 
 	finalize_config(setup);
 
-	if (!setup->start || !err)
-		return;
-
-	setup->start = FALSE;
-	finalize_resume(setup);
-
 	return;
 }