diff --git a/src/main/assemblies/files/fess.in.bat b/src/main/assemblies/files/fess.in.bat
index 79f4c47ee..7bc1d6f8e 100644
--- a/src/main/assemblies/files/fess.in.bat
+++ b/src/main/assemblies/files/fess.in.bat
@@ -31,6 +31,7 @@ REM stop-the-world GC pauses during resize, and so that we can lock the
 REM heap in memory on startup to prevent any of it from being swapped
 REM out.
 set JAVA_OPTS=%JAVA_OPTS% -Xms%FESS_MIN_MEM% -Xmx%FESS_MAX_MEM%
+set JAVA_OPTS=%JAVA_OPTS% -XX:MaxMetaspaceSize=128m -XX:CompressedClassSpaceSize=32m
 
 REM new generation
 if NOT "%FESS_HEAP_NEWSIZE%" == "" (
diff --git a/src/main/assemblies/files/fess.in.sh b/src/main/assemblies/files/fess.in.sh
index e69177e3b..065d493d3 100755
--- a/src/main/assemblies/files/fess.in.sh
+++ b/src/main/assemblies/files/fess.in.sh
@@ -27,6 +27,7 @@ fi
 # out.
 JAVA_OPTS="$JAVA_OPTS -Xms${FESS_MIN_MEM}"
 JAVA_OPTS="$JAVA_OPTS -Xmx${FESS_MAX_MEM}"
+JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=128m -XX:CompressedClassSpaceSize=32m"
 
 # new generation
 if [ "x$FESS_HEAP_NEWSIZE" != "x" ]; then