diff --git a/CHANGELOG b/CHANGELOG
index 2fd77d148c..6955349b10 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 v3.4.8 (XXXX-XX-XX)
 -------------------
 
+* Re-added warning for kernel setting "overcommit_memory=2" if jemalloc is also enabled.
+
 * Significantly reduced "random" 1 second delays in some arangosearch DDL operations.
 
 * Decreased unnecessary wait times for agency callbacks in case they were
diff --git a/lib/ApplicationFeatures/EnvironmentFeature.cpp b/lib/ApplicationFeatures/EnvironmentFeature.cpp
index 58dae9348e..80f5e8f86c 100644
--- a/lib/ApplicationFeatures/EnvironmentFeature.cpp
+++ b/lib/ApplicationFeatures/EnvironmentFeature.cpp
@@ -81,6 +81,15 @@ void EnvironmentFeature::prepare() {
     uint64_t v = basics::StringUtils::uint64(value);
 
     if (v == 2) {
+#ifdef ARANGODB_HAVE_JEMALLOC
+      LOG_TOPIC(WARN, arangodb::Logger::MEMORY)
+          << "/proc/sys/vm/overcommit_memory is set to a value of 2. this "
+             "setting has been found to be problematic";
+      LOG_TOPIC(WARN, Logger::MEMORY)
+          << "execute 'sudo bash -c \"echo 0 > "
+          << "/proc/sys/vm/overcommit_memory\"'";
+#endif
+
       // from https://www.kernel.org/doc/Documentation/sysctl/vm.txt:
       //
       //   When this flag is 0, the kernel attempts to estimate the amount