diff --git a/CHANGELOG.md b/CHANGELOG.md
index e98ceb0e..e69d53ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- [#332] Fixed a problem where the default values for the java heap memory were only used if a memory limit was configured. 
 
 ## [v7.2.7-15] - 2026-04-17
 ### Added
diff --git a/docs/gui/release_notes_de.md b/docs/gui/release_notes_de.md
index b9a2c169..2d7ac5cb 100644
--- a/docs/gui/release_notes_de.md
+++ b/docs/gui/release_notes_de.md
@@ -5,6 +5,8 @@ Im Folgenden finden Sie die Release Notes für das CAS-Dogu.
 Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/cas/CHANGELOG/).
 
 ## [Unreleased]
+- Es wurde ein Problem behoben, bei dem der Java-Heap-Speicher zu niedrig war, obwohl die Speicheranforderung des Pods ausreichend konfiguriert war.
+  Dies führte gelegentlich zu einem Java-Heap-Speicherfehler.
 
 ## [v7.2.7-15] - 2026-04-17
 - Es wurden nur technische Änderungen durchgeführt in Vorbereitung für die Integration des CAS in die LOP-IdP-Komponente.
diff --git a/docs/gui/release_notes_en.md b/docs/gui/release_notes_en.md
index e1f6644b..6034ce74 100644
--- a/docs/gui/release_notes_en.md
+++ b/docs/gui/release_notes_en.md
@@ -5,6 +5,8 @@ Below you will find the release notes for CAS-Dogu.
 Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/de/docs/dogus/cas/CHANGELOG/).
 
 ## [Unreleased]
+- Fixed an issue where the java heap memory was too low although the pod's memory request was big enough.
+  This sometimes caused a java heap memory error.
 
 ## [v7.2.7-15] - 2026-04-17
 - Only technical changes were made in preparation for integrating CAS into the LOP-IdP component.
diff --git a/resources/opt/apache-tomcat/bin/setenv.sh b/resources/opt/apache-tomcat/bin/setenv.sh
index c4c8109a..7bc5fbc9 100755
--- a/resources/opt/apache-tomcat/bin/setenv.sh
+++ b/resources/opt/apache-tomcat/bin/setenv.sh
@@ -5,10 +5,8 @@ JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
 JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStore=/etc/ssl/truststore.jks"
 JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStorePassword=changeit"
 JAVA_OPTS="$JAVA_OPTS -DbaseDir=/logs"
-if [ "$(doguctl config "container_config/memory_limit" -d "empty")" != "empty" ];  then
-  # Retrieve configurable java limits from etcd, valid default values exist
-  MEMORY_LIMIT_MAX_PERCENTAGE=$(doguctl config "container_config/java_max_ram_percentage")
-  MEMORY_LIMIT_MIN_PERCENTAGE=$(doguctl config "container_config/java_min_ram_percentage")
-  JAVA_OPTS="$JAVA_OPTS -XX:MaxRAMPercentage=${MEMORY_LIMIT_MAX_PERCENTAGE}"
-  JAVA_OPTS="$JAVA_OPTS -XX:MinRAMPercentage=${MEMORY_LIMIT_MIN_PERCENTAGE}"
-fi
\ No newline at end of file
+# Retrieve configurable java limits from etcd, valid default values exist
+MEMORY_LIMIT_MAX_PERCENTAGE=$(doguctl config "container_config/java_max_ram_percentage")
+MEMORY_LIMIT_MIN_PERCENTAGE=$(doguctl config "container_config/java_min_ram_percentage")
+JAVA_OPTS="$JAVA_OPTS -XX:MaxRAMPercentage=${MEMORY_LIMIT_MAX_PERCENTAGE}"
+JAVA_OPTS="$JAVA_OPTS -XX:MinRAMPercentage=${MEMORY_LIMIT_MIN_PERCENTAGE}"
\ No newline at end of file