diff --git a/cmd/gokapi/Main.go b/cmd/gokapi/Main.go
index 19ba907..8e811cd 100644
--- a/cmd/gokapi/Main.go
+++ b/cmd/gokapi/Main.go
@@ -135,7 +135,7 @@ func initCloudConfig(passedFlags flagparser.MainFlags) {
 		encLevel := configuration.Get().Encryption.Level
 		env := environment.New()
 		corsCheckDisabled := passedFlags.DisableCorsCheck || env.DisableCorsCheck
-		if !corsCheckDisabled && (encLevel == encryption.FullEncryptionStored || encLevel == encryption.FullEncryptionInput) {
+		if !corsCheckDisabled && (encLevel == encryption.FullEncryptionStored || encLevel == encryption.FullEncryptionInput || encLevel == encryption.EndToEndEncryption) {
 			ok, err := aws.IsCorsCorrectlySet(cConfig.Aws.Bucket, configuration.Get().ServerUrl)
 			if err != nil {
 				fmt.Println("Warning: Cannot check CORS settings. " + err.Error())
diff --git a/internal/webserver/web/templates/html_download.tmpl b/internal/webserver/web/templates/html_download.tmpl
index 1a847ca..f9ce85d 100644
--- a/internal/webserver/web/templates/html_download.tmpl
+++ b/internal/webserver/web/templates/html_download.tmpl
@@ -113,7 +113,13 @@
 
 			pump();
 		    } catch (err) {
-			displayError(err);
+		        if (err.message.includes("Failed to fetch")) {
+		        	console.log(err);
+				displayError("Unable to download file. Please contact the uploader. Possible problem: Incorrect CORS rules, if using remote storage");
+		        	
+		        } else {
+				displayError(err);
+		        }
 		    }
 		}