diff --git a/cleanup/cleanup.go b/cleanup/cleanup.go
index 5920c22..97789d5 100644
--- a/cleanup/cleanup.go
+++ b/cleanup/cleanup.go
@@ -8,8 +8,8 @@ import (
 	"github.com/andreimarcu/linx-server/expiry"
 )
 
-func Cleanup(filesDir string, metaDir string, noLogs bool) {
-	fileBackend := localfs.NewLocalfsBackend(metaDir, filesDir)
+func Cleanup(filesDir string, metaDir string, locksDir string, noLogs bool) {
+	fileBackend := localfs.NewLocalfsBackend(metaDir, filesDir, locksDir)
 
 	files, err := fileBackend.List()
 	if err != nil {
@@ -17,6 +17,15 @@ func Cleanup(filesDir string, metaDir string, noLogs bool) {
 	}
 
 	for _, filename := range files {
+		locked, err := fileBackend.CheckLock(filename)
+		if err != nil {
+			log.Printf("Error checking if %s is locked: %s", filename, err)
+		}
+		if locked {
+			log.Printf("%s is locked, it will be ignored", filename)
+			continue
+		}
+
 		metadata, err := fileBackend.Head(filename)
 		if err != nil {
 			if !noLogs {
@@ -33,10 +42,12 @@ func Cleanup(filesDir string, metaDir string, noLogs bool) {
 	}
 }
 
-func PeriodicCleanup(minutes time.Duration, filesDir string, metaDir string, noLogs bool) {
+func PeriodicCleanup(minutes time.Duration, filesDir string, metaDir string, locksDir string, noLogs bool) {
 	c := time.Tick(minutes)
 	for range c {
-		Cleanup(filesDir, metaDir, noLogs)
+		log.Printf("Running periodic cleanup")
+		Cleanup(filesDir, metaDir, locksDir, noLogs)
+		log.Printf("Finished periodic cleanup")
 	}
 
 }