diff --git a/host/src/attribute.rs b/host/src/attribute.rs
index 89c52ad..37fd0e6 100644
--- a/host/src/attribute.rs
+++ b/host/src/attribute.rs
@@ -391,6 +391,11 @@ impl<'d, M: RawMutex, const MAX: usize> AttributeTable<'d, M, MAX> {
                                 handle,
                                 cccd_handle: Some(next.handle),
                             });
+                        } else {
+                            return Ok(Characteristic {
+                                handle,
+                                cccd_handle: None,
+                            });
                         }
                     } else {
                         return Ok(Characteristic {