diff --git a/quiche/src/cid.rs b/quiche/src/cid.rs
index 685b5964a0a..15cb579d95a 100644
--- a/quiche/src/cid.rs
+++ b/quiche/src/cid.rs
@@ -187,15 +187,16 @@ impl BoundedNonEmptyConnectionIdVecDeque {
     ///
     /// [`OutOfIdentifiers`]: enum.Error.html#OutOfIdentifiers
     fn remove(&mut self, seq: u64) -> Result<Option<ConnectionIdEntry>> {
+        let index = match self.inner.iter().position(|e| e.seq == seq) {
+            Some(i) => i,
+            None => return Ok(None),
+        };
+
         if self.inner.len() <= 1 {
             return Err(Error::OutOfIdentifiers);
         }
 
-        Ok(self
-            .inner
-            .iter()
-            .position(|e| e.seq == seq)
-            .and_then(|index| self.inner.remove(index)))
+        Ok(self.inner.remove(index))
     }
 }
 
diff --git a/quiche/src/tests.rs b/quiche/src/tests.rs
index 7eec0653996..124248b95a8 100644
--- a/quiche/src/tests.rs
+++ b/quiche/src/tests.rs
@@ -10105,6 +10105,37 @@ fn lost_connection_id_frames(
     assert_eq!(pipe.client.retired_scid_next(), None);
 }
 
+#[rstest]
+fn duplicate_retire_connection_id(
+    #[values("cubic", "bbr2_gcongestion")] cc_algorithm_name: &str,
+) {
+    let mut config = test_utils::Pipe::default_config(cc_algorithm_name).unwrap();
+    config.set_active_connection_id_limit(2);
+
+    let mut pipe = test_utils::Pipe::with_config(&mut config).unwrap();
+    assert_eq!(pipe.handshake(), Ok(()));
+
+    let (cid, reset_token) = test_utils::create_cid_and_reset_token(16);
+    assert_eq!(pipe.client.new_scid(&cid, reset_token, false), Ok(1));
+    assert_eq!(pipe.advance(), Ok(()));
+
+    let mut buf = [0u8; 65535];
+    let frames = [frame::Frame::RetireConnectionId { seq_num: 1 }];
+
+    for _ in 0..2 {
+        let len = test_utils::encode_pkt(
+            &mut pipe.server,
+            Type::Short,
+            &frames,
+            &mut buf,
+        )
+        .unwrap();
+        pipe.client_recv(&mut buf[..len]).unwrap();
+    }
+
+    assert!(pipe.client.retired_scid_next().is_some());
+}
+
 #[rstest]
 fn sending_duplicate_scids(
     #[values("cubic", "bbr2_gcongestion")] cc_algorithm_name: &str,