diff --git a/drivers/mbimmodem/mbim.c b/drivers/mbimmodem/mbim.c
index db0528c0..4eef713f 100644
--- a/drivers/mbimmodem/mbim.c
+++ b/drivers/mbimmodem/mbim.c
@@ -267,6 +267,29 @@ static void pending_command_free(void *pending)
 	l_free(pending);
 }
 
+static void pending_command_cancel_by_gid(void *data, void *user_data)
+{
+	struct pending_command *pending = data;
+	uint32_t gid = L_PTR_TO_UINT(user_data);
+
+	if (pending->gid != gid)
+		return;
+
+	pending_command_cancel(pending);
+}
+
+static bool pending_command_free_by_gid(void *data, void *user_data)
+{
+	struct pending_command *pending = data;
+	uint32_t gid = L_PTR_TO_UINT(user_data);
+
+	if (pending->gid != gid)
+		return false;
+
+	pending_command_free(pending);
+	return true;
+}
+
 static inline uint32_t _mbim_device_get_next_tid(struct mbim_device *device)
 {
 	uint32_t tid = device->next_tid;
@@ -915,3 +938,19 @@ bool mbim_device_cancel(struct mbim_device *device, uint32_t tid)
 	pending_command_cancel(pending);
 	return true;
 }
+
+bool mbim_device_cancel_group(struct mbim_device *device, uint32_t gid)
+{
+	if (unlikely(!device))
+		return false;
+
+	l_queue_foreach_remove(device->pending_commands,
+					pending_command_free_by_gid,
+					L_UINT_TO_PTR(gid));
+
+	l_queue_foreach(device->sent_commands,
+					pending_command_cancel_by_gid,
+					L_UINT_TO_PTR(gid));
+
+	return true;
+}
diff --git a/drivers/mbimmodem/mbim.h b/drivers/mbimmodem/mbim.h
index 7c7758d8..197181b4 100644
--- a/drivers/mbimmodem/mbim.h
+++ b/drivers/mbimmodem/mbim.h
@@ -63,3 +63,4 @@ uint32_t mbim_device_send(struct mbim_device *device, uint32_t gid,
 				void *user_data,
 				mbim_device_destroy_func_t destroy);
 bool mbim_device_cancel(struct mbim_device *device, uint32_t tid);
+bool mbim_device_cancel_group(struct mbim_device *device, uint32_t gid);