diff --git a/nsock/src/gh_list.h b/nsock/src/gh_list.h
index 20741018a..5c44db48e 100644
--- a/nsock/src/gh_list.h
+++ b/nsock/src/gh_list.h
@@ -210,6 +210,15 @@ static inline gh_lnode_t *gh_list_pop(gh_list_t *list) {
 static inline int gh_list_remove(gh_list_t *list, gh_lnode_t *lnode) {
   paranoid_list_check(list);
 
+#if GH_LIST_PARANOID
+  gh_lnode_t *cur;
+  for (cur = list->first; cur != list->last; cur = cur->next) {
+    if (cur == lnode)
+      break;
+  }
+  assert(cur == lnode);
+#endif
+
   if (lnode->prev) {
     lnode->prev->next = lnode->next;
   } else {