diff --git a/libpod/util.go b/libpod/util.go
index 5154a261e6..e89c6faaa1 100644
--- a/libpod/util.go
+++ b/libpod/util.go
@@ -56,6 +56,7 @@ func WaitForFile(path string, chWait chan error, timeout time.Duration) (bool, e
 			inotifyEvents = watcher.Events
 		}
 		defer watcher.Close()
+		defer watcher.Remove(filepath.Dir(path))
 	}
 
 	var timeoutChan <-chan time.Time