diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go
index fcc75762fd4..ffaa75de9cc 100644
--- a/pkg/services/cleanup/cleanup.go
+++ b/pkg/services/cleanup/cleanup.go
@@ -52,6 +52,10 @@ func (service *CleanUpService) start(ctx context.Context) error {
 }
 
 func (service *CleanUpService) cleanUpTmpFiles() {
+	if _, err := os.Stat(setting.ImagesDir); os.IsNotExist(err) {
+		return
+	}
+
 	files, err := ioutil.ReadDir(setting.ImagesDir)
 	if err != nil {
 		service.log.Error("Problem reading image dir", "error", err)