diff --git a/src/cleanup.go b/src/cleanup.go
index 4416d2c..89015c0 100644
--- a/src/cleanup.go
+++ b/src/cleanup.go
@@ -17,4 +17,9 @@ func (c *Croc) cleanup() {
 	}
 	os.Remove(c.crocFile)
 	os.Remove(c.crocFileEncrypted)
+	c.cs.Lock()
+	if c.cs.channel.fileMetaData.DeleteAfterSending {
+		os.Remove(c.cs.channel.fileMetaData.Name)
+	}
+	defer c.cs.Unlock()
 }