diff --git a/ChangeLog b/ChangeLog
index 7d44838badbae517731466392f4d133b987fe5eb..39a577e77397422f91aa9e9da133776edfbb0a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
-2024-10-21  Uwe Schulzweida
+2024-06-21  Uwe Schulzweida
 
         * using CGRIBEX library version 2.3.0
         * using EXSE library version 2.0.0
 	* Version 2.4.2 released
 
+2024-06-18  Uwe Schulzweida
+
+	* NetCDF4: set always the CDI calculate chunk cache size
+
 2024-06-17  Uwe Schulzweida
 
 	* streamDefFilter(): changed interface
diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index b6ea1cfefb85020e28ac8189cceb0dfc0b3092ab..89dd81a5dffa5bf3a2f0a182e1001e771974454f 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -3597,11 +3597,8 @@ cdf_define_all_vars(stream_t *streamptr, int vlistID, int instID, int modelID, i
           if (ncvar->chunkType != CDI_UNDEFID) cdiDefKeyInt(vlistID, varID, CDI_KEY_CHUNKTYPE, ncvar->chunkType);
           if (ncvar->chunkSize > 1) cdiDefKeyInt(vlistID, varID, CDI_KEY_CHUNKSIZE, ncvar->chunkSize);
 
-          size_t varChunkCacheSize = calc_chunk_cache_size(timedimid, ncvar);
-          if (CDI_Chunk_Cache > 0)
-            cdf_set_var_chunk_cache(ncvar, ncvarid, CDI_Chunk_Cache);
-          else if (varChunkCacheSize > ncvar->chunkCacheSize)
-            cdf_set_var_chunk_cache(ncvar, ncvarid, varChunkCacheSize);
+          size_t cacheSize = (CDI_Chunk_Cache > 0) ? CDI_Chunk_Cache : calc_chunk_cache_size(timedimid, ncvar);
+          cdf_set_var_chunk_cache(ncvar, ncvarid, cacheSize);
         }
 #endif