diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 56286dbe40..426dd5fea5 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -5867,9 +5867,9 @@ static void destroy_session(struct skinnysession *s)
 {
 	struct skinnysession *cur;
 	AST_LIST_LOCK(&sessions);
-	AST_LIST_TRAVERSE(&sessions, cur, list) {
+	AST_LIST_TRAVERSE_SAFE_BEGIN(&sessions, cur, list) {
 		if (cur == s) {
-			AST_LIST_REMOVE(&sessions, s, list);
+			AST_LIST_REMOVE_CURRENT(list);
 			if (s->fd > -1) 
 				close(s->fd);
 			
@@ -5880,6 +5880,7 @@ static void destroy_session(struct skinnysession *s)
 			ast_log(LOG_WARNING, "Trying to delete nonexistent session %p?\n", s);
 		}
 	}
+	AST_LIST_TRAVERSE_SAFE_END
 	AST_LIST_UNLOCK(&sessions);
 }