diff --git a/src/channel.c b/src/channel.c
index d5240fc..6dde107 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -4457,9 +4457,11 @@
 	    if (channel->ch_killing)
 	    {
 		channel_free_contents(channel);
+		channel_free_channel(channel);
 		channel->ch_job->jv_channel = NULL;
 	    }
-	    channel_free(channel);
+	    else
+		channel_free(channel);
 	    // channel has been freed, start over
 	    channel = first_channel;
 	    continue;