diff --git a/controllers/data_controller/export_controller.go b/controllers/data_controller/export_controller.go
index 8ed170c235f84f2ec31289e9ccead39baff0b464..67dfd063a552291d5bbc5d4281e57fc3070938ac 100644
--- a/controllers/data_controller/export_controller.go
+++ b/controllers/data_controller/export_controller.go
@@ -227,25 +227,25 @@ func StartUserExport(userId string, s3urls bool, includeData bool, log *logrus.E
 			return
 		}
 
-		log.Info("Building and writing index")
-		t, err := templating.GetTemplate("export_index")
-		if err != nil {
-			log.Error(err)
-			return
-		}
-		html := bytes.Buffer{}
-		err = t.Execute(&html, indexModel)
-		if err != nil {
-			log.Error(err)
-			return
-		}
-		err = putFile("index.html", int64(html.Len()), time.Now(), util.BufferToStream(bytes.NewBuffer(html.Bytes())))
-		if err != nil {
-			log.Error(err)
-			return
-		}
-
 		if includeData {
+			log.Info("Building and writing index")
+			t, err := templating.GetTemplate("export_index")
+			if err != nil {
+				log.Error(err)
+				return
+			}
+			html := bytes.Buffer{}
+			err = t.Execute(&html, indexModel)
+			if err != nil {
+				log.Error(err)
+				return
+			}
+			err = putFile("index.html", int64(html.Len()), time.Now(), util.BufferToStream(bytes.NewBuffer(html.Bytes())))
+			if err != nil {
+				log.Error(err)
+				return
+			}
+
 			log.Info("Including data in the archive")
 			for _, m := range media {
 				log.Info("Downloading ", m.MxcUri())