diff --git a/cmd/dwelling-upload/main.go b/cmd/dwelling-upload/main.go
index a96d693..317aae3 100644
--- a/cmd/dwelling-upload/main.go
+++ b/cmd/dwelling-upload/main.go
@@ -47,6 +47,12 @@ func main() {
 		log.Fatalln(err)
 	}
 
+	defer func() {
+		if nt, addr := config.SplitNetworkAddress(); nt == "unix" {
+			os.Remove(addr)
+		}
+	}()
+
 	if config.Chroot != "" {
 		if err := syscall.Chroot(config.Chroot); err != nil {
 			log.Fatalln("failed to chroot:", err)
@@ -122,10 +128,6 @@ func main() {
 					logErr.Fatalln(err)
 				}
 
-				if nt, addr := config.SplitNetworkAddress(); nt == "unix" {
-					os.Remove(addr)
-				}
-
 				closeSignal <- true
 			case <-uploadDirNotify:
 				sz, err := utils.DirectorySize(config.Uploads.Directory)