diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp
index e69de29b..c4f702cf 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp
@@ -0,0 +1 @@
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp
index 28d819f8..503da999 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp
index a906c72f..5d4bc8a2 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp
@@ -1,4 +1,4 @@
-<%@ page session="false"%>
+<%@ page session="false" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf b/airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf
index ea22c6a8..9e7b31fc 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
 <div id="javaJukeboxPlayerControlBar" class="bgcolor2" style="position:fixed; bottom:0; width:100%;padding-top:10px;padding-bottom: 5px">
     <table style="white-space:nowrap;">
         <tr style="white-space:nowrap;">
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp
index 693cc713..40f79a65 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
 <link rel="stylesheet" href="<c:url value='/style/smoothness/jquery-ui-1.12.1.min.css'/>" type="text/css">
 <link rel="stylesheet" href="<c:url value='/script/jquery.toastmessage/css/jquery.toastmessage.css' />" type="text/css" >
 <script type="text/javascript" src="<c:url value='/script/jquery-3.4.0.min.js'/>"></script>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcast.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcast.jsp
index 14533685..6b6e26ff 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcast.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcast.jsp
@@ -1,5 +1,6 @@
-<%@ include file="include.jsp" %>
 <%@ page language="java" contentType="text/xml; charset=utf-8" pageEncoding="iso-8859-1"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
 <rss version="2.0">
     <channel>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/viewSelector.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/viewSelector.jsp
index aafb3681..289f8baf 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/viewSelector.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/viewSelector.jsp
@@ -17,6 +17,7 @@
   ~  Copyright 2015 (C) Sindre Mehus
   --%>
 
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <div style="float:right;padding-right:1em">