diff --git a/openmls/src/group/mls_group/errors.rs b/openmls/src/group/mls_group/errors.rs
index 3a8986ce8..e7db4edd1 100644
--- a/openmls/src/group/mls_group/errors.rs
+++ b/openmls/src/group/mls_group/errors.rs
@@ -220,7 +220,7 @@ pub enum UpdateGroupMembershipError<StorageError> {
     CreateCommitError(#[from] CreateCommitError<StorageError>),
     /// See [`MlsGroupStateError`] for more details.
     #[error(transparent)]
-    GroupStateError(#[from] MlsGroupStateError<StorageError>),
+    GroupStateError(#[from] MlsGroupStateError),
     /// The member that should be removed can not be found.
     #[error("The member that should be removed can not be found.")]
     UnknownMember,
diff --git a/openmls/src/group/mls_group/membership.rs b/openmls/src/group/mls_group/membership.rs
index efa0ae059..efb2abd04 100644
--- a/openmls/src/group/mls_group/membership.rs
+++ b/openmls/src/group/mls_group/membership.rs
@@ -57,7 +57,6 @@ impl MlsGroup {
 
         let params = CreateCommitParams::builder()
             .framing_parameters(self.framing_parameters())
-            .proposal_store(&self.proposal_store)
             .inline_proposals(proposals)
             .build();
         let create_commit_result = self.group.create_commit(params, provider, signer)?;
@@ -77,6 +76,8 @@ impl MlsGroup {
             .write_group_state(self.group_id(), &self.group_state)
             .map_err(UpdateGroupMembershipError::StorageError)?;
 
+        self.reset_aad();
+
         Ok((
             mls_messages,
             create_commit_result