diff --git a/sys/net/gnrc/sock/ip/gnrc_sock_ip.c b/sys/net/gnrc/sock/ip/gnrc_sock_ip.c
index 86521f45c6..ee3de88fdf 100644
--- a/sys/net/gnrc/sock/ip/gnrc_sock_ip.c
+++ b/sys/net/gnrc/sock/ip/gnrc_sock_ip.c
@@ -158,18 +158,13 @@ ssize_t sock_ip_recv_buf_aux(sock_ip_t *sock, void **data, void **buf_ctx,
         return -EPROTO;
     }
 #if IS_USED(MODULE_SOCK_AUX_LOCAL)
-    if ((aux != NULL) && (aux->flags & SOCK_AUX_GET_LOCAL)) {
+    if (aux != NULL) {
         aux->flags &= ~(SOCK_AUX_GET_LOCAL);
     }
 #endif
 #if IS_USED(MODULE_SOCK_AUX_TIMESTAMP)
-    if ((aux != NULL) && (aux->flags & SOCK_AUX_GET_TIMESTAMP)) {
-        /* check if network interface did provide a timestamp; this depends on
-         * hardware support. A timestamp of zero is used to indicate a missing
-         * timestamp */
-        if (aux->timestamp > 0) {
-            aux->flags &= ~SOCK_AUX_GET_TIMESTAMP;
-        }
+    if ((aux != NULL) && (_aux.flags & GNRC_SOCK_RECV_AUX_FLAG_TIMESTAMP)) {
+        aux->flags &= ~(SOCK_AUX_GET_TIMESTAMP);
     }
 #endif
     *data = pkt->data;
diff --git a/sys/net/gnrc/sock/udp/gnrc_sock_udp.c b/sys/net/gnrc/sock/udp/gnrc_sock_udp.c
index dbfa9cbcc5..caf03da1e8 100644
--- a/sys/net/gnrc/sock/udp/gnrc_sock_udp.c
+++ b/sys/net/gnrc/sock/udp/gnrc_sock_udp.c
@@ -258,13 +258,8 @@ ssize_t sock_udp_recv_buf_aux(sock_udp_t *sock, void **data, void **buf_ctx,
     }
 #endif
 #if IS_USED(MODULE_SOCK_AUX_TIMESTAMP)
-    if ((aux != NULL) && (aux->flags & SOCK_AUX_GET_TIMESTAMP)) {
-        /* check if network interface did provide a timestamp; this depends on
-         * hardware support. A timestamp of zero is used to indicate a missing
-         * timestamp */
-        if (_aux.flags & GNRC_SOCK_RECV_AUX_FLAG_TIMESTAMP) {
-            aux->flags &= ~SOCK_AUX_GET_TIMESTAMP;
-        }
+    if ((aux != NULL) && (_aux.flags & GNRC_SOCK_RECV_AUX_FLAG_TIMESTAMP)) {
+        aux->flags &= ~SOCK_AUX_GET_TIMESTAMP;
     }
 #endif
     *data = pkt->data;
diff --git a/tests/gnrc_sock_ip/Makefile b/tests/gnrc_sock_ip/Makefile
index 20888afa0d..737b60e7fb 100644
--- a/tests/gnrc_sock_ip/Makefile
+++ b/tests/gnrc_sock_ip/Makefile
@@ -7,7 +7,7 @@ ifeq (1, $(AUX_LOCAL))
   USEMODULE += sock_aux_local
 endif
 
-ifeq (1, $(AUX_LOCAL))
+ifeq (1, $(AUX_TIMESTAMP))
   USEMODULE += sock_aux_timestamp
 endif
 
diff --git a/tests/gnrc_sock_udp/Makefile b/tests/gnrc_sock_udp/Makefile
index ac0652b55a..749135a2b4 100644
--- a/tests/gnrc_sock_udp/Makefile
+++ b/tests/gnrc_sock_udp/Makefile
@@ -7,7 +7,7 @@ ifeq (1, $(AUX_LOCAL))
   USEMODULE += sock_aux_local
 endif
 
-ifeq (1, $(AUX_LOCAL))
+ifeq (1, $(AUX_TIMESTAMP))
   USEMODULE += sock_aux_timestamp
 endif