diff --git a/server/server.go b/server/server.go
index fd3c5576..6aedb036 100644
--- a/server/server.go
+++ b/server/server.go
@@ -130,6 +130,9 @@ func main() {
 						wg.Wait()
 						updating = false
 					}
+					if c.GlobalString("clair") != "" {
+						wg.Wait()
+					}
 				}
 			}
 		}()