diff --git a/server/server.go b/server/server.go
index f5059b9..f4f8000 100644
--- a/server/server.go
+++ b/server/server.go
@@ -103,11 +103,13 @@ func serveMediaDirectory(w http.ResponseWriter, req *http.Request) {
 		http.Error(w, "is a directory; maybe you are looking for " + path, http.StatusForbidden)
 		return
 	}
+
 	f, err := os.Open(filePath)
 	if err != nil {
 		http.Error(w, "not found", http.StatusNotFound)
 		return
 	}
+	defer f.Close()
 	util.DoChunks(f, 4, func (buf []byte) { w.Write(buf) })
 }
 
diff --git a/util/util.go b/util/util.go
index 55d3667..77149eb 100644
--- a/util/util.go
+++ b/util/util.go
@@ -26,6 +26,7 @@ func Dirents(dir string) (entries []string, err error) {
 	if err != nil {
 		return nil, errors.New(err.Error())
 	}
+	defer d.Close()
 
 	names, err := d.Readdirnames(0)
 	if err != nil {