diff --git a/drivers/usb/gadget/f_audio_source.c b/drivers/usb/gadget/f_audio_source.c
index 003f5fa6b804d2e431e59ffd2ce8f0c7493a7026..353219141d99381653059e3e1a48317f6a29305b 100644
--- a/drivers/usb/gadget/f_audio_source.c
+++ b/drivers/usb/gadget/f_audio_source.c
@@ -260,6 +260,7 @@ struct audio_dev {
 	s64				frames_sent;
 
 	bool				audio_ep_enabled;
+	bool				triggered;
 };
 
 static inline struct audio_dev *func_to_audio_source(struct usb_function *f)
@@ -267,6 +268,8 @@ static inline struct audio_dev *func_to_audio_source(struct usb_function *f)
 	return container_of(f, struct audio_dev, func);
 }
 
+static void audio_pcm_playback_start(struct audio_dev *audio);
+
 /*-------------------------------------------------------------------------*/
 
 static struct usb_request *audio_request_new(struct usb_ep *ep, int buffer_size)
@@ -545,6 +548,10 @@ static int audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 				return ret;
 			}
 			audio->audio_ep_enabled = true;
+			if (audio->triggered) {
+				// resume playing if we are still triggered
+				audio_pcm_playback_start(audio);
+			}
 		} else if (!alt && audio->audio_ep_enabled) {
 			usb_ep_disable(audio->in_ep);
 			audio->audio_ep_enabled = false;
@@ -767,11 +774,13 @@ static int audio_pcm_playback_trigger(struct snd_pcm_substream *substream,
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
 	case SNDRV_PCM_TRIGGER_RESUME:
+		audio->triggered = 1;
 		audio_pcm_playback_start(audio);
 		break;
 
 	case SNDRV_PCM_TRIGGER_STOP:
 	case SNDRV_PCM_TRIGGER_SUSPEND:
+		audio->triggered = 0;
 		audio_pcm_playback_stop(audio);
 		break;