diff --git a/src/main/java/dk/kb/netarchivesuite/solrwayback/service/SolrWaybackResource.java b/src/main/java/dk/kb/netarchivesuite/solrwayback/service/SolrWaybackResource.java
index e9f9daaa..13716e52 100644
--- a/src/main/java/dk/kb/netarchivesuite/solrwayback/service/SolrWaybackResource.java
+++ b/src/main/java/dk/kb/netarchivesuite/solrwayback/service/SolrWaybackResource.java
@@ -482,8 +482,9 @@ private String createZipFilename(String contentType) {
     Date date = new Date() ;
     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 
-    String filename = dateFormat.format(date) + "_" + contentType.replaceAll(" ", "")
-                                    .replaceAll("/", "_") + "_export.zip";
+    String filename = dateFormat.format(date) + "_" + contentType.replaceAll(" OR ", "_or_")
+                                                      .replaceAll(" ", "")
+                                                      .replaceAll("/", "_") + "_export.zip";
     filename = Normalizer.normalize(filename, Normalizer.Form.NFD);
 
     return filename.replaceAll("[^\\x00-\\x7F]", "");