diff --git a/httpd.c b/httpd.c
index 334d73d..e8223f5 100644
--- a/httpd.c
+++ b/httpd.c
@@ -354,10 +354,6 @@ void job_wait(xs_val **job)
         /* unlock the mutex */
         pthread_mutex_unlock(&job_mutex);
     }
-
-    if (!*job) {
-        sem_close(job_sem);
-    }
 }
 
 
@@ -568,5 +564,7 @@ void httpd(void)
     job_fifo = xs_free(job_fifo);
     pthread_mutex_unlock(&job_mutex);
 
+    sem_close(job_sem);
+
     srv_log(xs_fmt("httpd stop %s:%d", address, port));
 }