diff --git a/firmware/network/chamos/Kconfig b/firmware/network/chamos/Kconfig
index 45da41b2a..e682b926c 100644
--- a/firmware/network/chamos/Kconfig
+++ b/firmware/network/chamos/Kconfig
@@ -2,4 +2,9 @@ menu "Chamos server"
     config HEADER_ADDRESS_MULTICAST
         string "MULTICAST IPV6 HEADER"
         default "ff02::1"
+
+    config SERVER_BUFFER_SIZE
+        int "Default server buffer size"
+        default 20
+        range 20  100
 endmenu
diff --git a/firmware/network/chamos/chamos.c b/firmware/network/chamos/chamos.c
index 0c09e2728..5f1255c79 100644
--- a/firmware/network/chamos/chamos.c
+++ b/firmware/network/chamos/chamos.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /**
- * @brief   CHAMOS Communication Handler for Addressing Management | Origin Server
+ * @brief   CHAMOS  Communication Handler for Addressing Management | Origin Server
  *
  * @author  RocioRojas <Rociorojas391@gmail.com>
  */
@@ -27,7 +27,7 @@
 #include "xtimer.h"
 
 #define CHAMOS_MSG_QUEUE_SIZE (8)
-#define SERVER_BUFFER_SIZE (20)
+#define SERVER_BUFFER_SIZE (CONFIG_SERVER_BUFFER_SIZE)
 
 /**
  * @brief   GNRC netif
diff --git a/firmware/network/radio/radio.c b/firmware/network/radio/radio.c
index 5f8484895..bb31c0b8c 100644
--- a/firmware/network/radio/radio.c
+++ b/firmware/network/radio/radio.c
@@ -27,7 +27,6 @@
 #include "net/netif.h"
 #include "net/netdev/ieee802154.h"
 #include "net/gnrc.h"
-#include "uniqueid.h"
 #include "net/netdev.h"
 #include "radio.h"