diff --git a/src/dispatch.rs b/src/dispatch.rs
index f982204..51e50c5 100644
--- a/src/dispatch.rs
+++ b/src/dispatch.rs
@@ -397,9 +397,8 @@ impl<'pipe> ApduDispatch<'pipe> {
                 RawApduBuffer::Request(apdu) => app.select(interface, apdu, &mut response),
                 _ => panic!("Unexpected buffer state."),
             };
-            if result.is_ok() {
-                self.current_aid = Some(aid);
-            }
+
+            self.current_aid = Some(aid);
 
             self.handle_app_response(&result, &response);
         } else {