diff --git a/src/mme/mme-fd-path.c b/src/mme/mme-fd-path.c
index 815b8fae4..c0f7b824d 100644
--- a/src/mme/mme-fd-path.c
+++ b/src/mme/mme-fd-path.c
@@ -220,7 +220,8 @@ static void mme_s6a_aia_cb(void *data, struct msg **msg)
     
     ret = fd_sess_state_retrieve(mme_s6a_reg, session, &sess_data);
     ogs_assert(ret == 0);
-    ogs_assert(sess_data && (void *)sess_data == data);
+    ogs_assert(sess_data);
+    ogs_assert((void *)sess_data == data);
 
     mme_ue = sess_data->mme_ue;
     ogs_assert(mme_ue);
@@ -590,7 +591,8 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg)
     
     ret = fd_sess_state_retrieve(mme_s6a_reg, session, &sess_data);
     ogs_assert(ret == 0);
-    ogs_assert(sess_data && (void *)sess_data == data);
+    ogs_assert(sess_data);
+    ogs_assert((void *)sess_data == data);
 
     mme_ue = sess_data->mme_ue;
     ogs_assert(mme_ue);
diff --git a/src/pcrf/pcrf-gx-path.c b/src/pcrf/pcrf-gx-path.c
index 8c27b15b9..792e57170 100644
--- a/src/pcrf/pcrf-gx-path.c
+++ b/src/pcrf/pcrf-gx-path.c
@@ -958,7 +958,8 @@ static void pcrf_gx_raa_cb(void *data, struct msg **msg)
     
     ret = fd_sess_state_retrieve(pcrf_gx_reg, session, &sess_data);
     ogs_assert(ret == 0);
-    ogs_assert(sess_data && (void *)sess_data == data);
+    ogs_assert(sess_data);
+    ogs_assert((void *)sess_data == data);
 
     /* Value of Result Code */
     ret = fd_msg_search_avp(*msg, fd_result_code, &avp);
diff --git a/src/pgw/pgw-fd-path.c b/src/pgw/pgw-fd-path.c
index 6dd065689..0c5abb0fc 100644
--- a/src/pgw/pgw-fd-path.c
+++ b/src/pgw/pgw-fd-path.c
@@ -466,7 +466,8 @@ static void pgw_gx_cca_cb(void *data, struct msg **msg)
     
     ret = fd_sess_state_retrieve(pgw_gx_reg, session, &sess_data);
     ogs_assert(ret == 0);
-    ogs_assert(sess_data && (void *)sess_data == data);
+    ogs_assert(sess_data);
+    ogs_assert((void *)sess_data == data);
 
     xact = sess_data->xact;
     ogs_assert(xact);
diff --git a/tests/volte/pcscf-fd-path.c b/tests/volte/pcscf-fd-path.c
index 9c8191b8b..00e56bd26 100644
--- a/tests/volte/pcscf-fd-path.c
+++ b/tests/volte/pcscf-fd-path.c
@@ -427,7 +427,8 @@ static void pcscf_rx_aaa_cb(void *data, struct msg **msg)
     
     ret = fd_sess_state_retrieve(pcscf_rx_reg, session, &sess_data);
     ogs_assert(ret == 0);
-    ogs_assert(sess_data && (void *)sess_data == data);
+    ogs_assert(sess_data);
+    ogs_assert((void *)sess_data == data);
 
     /* Value of Result Code */
     ret = fd_msg_search_avp(*msg, fd_result_code, &avp);