diff --git a/epicardium/ble/app/common/app_db.c b/epicardium/ble/app/common/app_db.c
index d79a998ee990a5ab8620551c6667256a4e3149d7..cf054afd206ebd22563dec986f99fdc7254ba359 100644
--- a/epicardium/ble/app/common/app_db.c
+++ b/epicardium/ble/app/common/app_db.c
@@ -713,8 +713,10 @@ uint32_t AppDbGetPeerSignCounter(appDbHdl_t hdl)
 /*************************************************************************************************/
 void AppDbSetPeerSignCounter(appDbHdl_t hdl, uint32_t signCounter)
 {
-  ((appDbRec_t *)hdl)->peerSignCounter = signCounter;
-  store();
+  if(((appDbRec_t *)hdl)->peerSignCounter != signCounter) {
+    ((appDbRec_t *)hdl)->peerSignCounter = signCounter;
+    store();
+  }
 }
 
 /*************************************************************************************************/
diff --git a/epicardium/ble/ble_main.c b/epicardium/ble/ble_main.c
index 5c30987137c82a0827cf4846525d0eacad6f032c..b1ed2276478dbbadb86515f012948b8cc74d401a 100644
--- a/epicardium/ble/ble_main.c
+++ b/epicardium/ble/ble_main.c
@@ -37,6 +37,7 @@
 #include "bas/bas_api.h"
 #include "hrps/hrps_api.h"
 #include "rscp/rscp_api.h"
+#include "cccd.h"
 
 #include "modules/log.h"
 
@@ -175,14 +176,6 @@ uint8_t bleScanDataDisc[] =
   Client Characteristic Configuration Descriptors
 **************************************************************************************************/
 
-/*! enumeration of client characteristic configuration descriptors */
-enum
-{
-  BLE_GATT_SC_CCC_IDX,                    /*! GATT service, service changed characteristic */
-  BLE_BATT_LVL_CCC_IDX,                   /*! Battery service, battery level characteristic */
-  BLE_NUM_CCC_IDX
-};
-
 /*! client characteristic configuration descriptors settings, indexed by above enumeration */
 static const attsCccSet_t bleCccSet[BLE_NUM_CCC_IDX] =
 {
diff --git a/epicardium/ble/cccd.h b/epicardium/ble/cccd.h
new file mode 100644
index 0000000000000000000000000000000000000000..02574bbdc9d0316eeff03ce3a1c19b1b0f09c94c
--- /dev/null
+++ b/epicardium/ble/cccd.h
@@ -0,0 +1,9 @@
+#pragma once
+/*! enumeration of client characteristic configuration descriptors */
+enum
+{
+  BLE_GATT_SC_CCC_IDX,                    /*! GATT service, service changed characteristic */
+  BLE_BATT_LVL_CCC_IDX,                   /*! Battery service, battery level characteristic */
+  BLE_NUM_CCC_IDX
+};
+