diff --git a/src/cloud/cloud_codec/lwm2m/lwm2m_codec_helpers.c b/src/cloud/cloud_codec/lwm2m/lwm2m_codec_helpers.c
index 77c9f6d..1329c9c 100644
--- a/src/cloud/cloud_codec/lwm2m/lwm2m_codec_helpers.c
+++ b/src/cloud/cloud_codec/lwm2m/lwm2m_codec_helpers.c
@@ -685,8 +685,8 @@ int lwm2m_codec_helpers_set_modem_dynamic_data(struct cloud_data_modem_dynamic *
 		return err;
 	}
 
-	err = lwm2m_set_s8(&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, RSS),
-			   (int8_t)modem_dynamic->rsrp);
+	err = lwm2m_set_s16(&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, RSS),
+			    modem_dynamic->rsrp);
 	if (err) {
 		return err;
 	}
diff --git a/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c b/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c
index 4cc922f..7369db1 100644
--- a/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c
+++ b/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c
@@ -560,7 +560,7 @@ void test_codec_helpers_set_modem_dynamic_data(void)
 	__cmock_lwm2m_set_res_buf_ExpectAnyArgsAndReturn(0);
 	__cmock_lwm2m_set_res_buf_ExpectAnyArgsAndReturn(0);
 
-	__cmock_lwm2m_set_s8_ExpectAndReturn(
+	__cmock_lwm2m_set_s16_ExpectAndReturn(
 		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, RSS),
 		modem_dynamic.rsrp, 0);