diff --git a/lib/filegen/client/machine.go b/lib/filegen/client/machine.go
index 517342c30..78e578133 100644
--- a/lib/filegen/client/machine.go
+++ b/lib/filegen/client/machine.go
@@ -133,6 +133,7 @@ func waitForObjectsAndSendUpdate(objectChannel <-chan hash.Hash,
 		delete(objectsToWaitFor, hashVal)
 		if len(objectsToWaitFor) < 1 {
 			updateChannel <- files // This will panic if the machine went away.
+			return
 		}
 	}
 }