diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index d2db8489f19..f15465a20c1 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -120,6 +120,11 @@ public:
         return amount.load(std::memory_order_relaxed);
     }
 
+    Int64 getRSS() const
+    {
+        return rss.load(std::memory_order_relaxed);
+    }
+
     // Merges and mutations may pass memory ownership to other threads thus in the end of execution
     // MemoryTracker for background task may have a non-zero counter.
     // This method is intended to fix the counter inside of background_memory_tracker.
diff --git a/src/Common/MemoryWorker.cpp b/src/Common/MemoryWorker.cpp
index e148f7f8f49..1b869ed9d6b 100644
--- a/src/Common/MemoryWorker.cpp
+++ b/src/Common/MemoryWorker.cpp
@@ -312,7 +312,7 @@ uint64_t MemoryWorker::getMemoryUsage()
 void MemoryWorker::backgroundThread()
 {
     std::chrono::milliseconds chrono_period_ms{period_ms};
-    bool first_run = true;
+    [[maybe_unused]] bool first_run = true;
     std::unique_lock lock(mutex);
     while (true)
     {
@@ -340,17 +340,15 @@ void MemoryWorker::backgroundThread()
         }
 #endif
 
+#if USE_JEMALLOC
         if (unlikely(first_run || total_memory_tracker.get() < 0))
         {
-#if USE_JEMALLOC
             if (source != MemoryUsageSource::Jemalloc)
                 epoch_mib.setValue(0);
 
             MemoryTracker::updateAllocated(allocated_mib.getValue());
-#elif defined(OS_LINUX)
-            MemoryTracker::updateAllocated(resident);
-#endif
         }
+#endif
 
         ProfileEvents::increment(ProfileEvents::MemoryWorkerRun);
         ProfileEvents::increment(ProfileEvents::MemoryWorkerRunElapsedMicroseconds, total_watch.elapsedMicroseconds());
diff --git a/src/Coordination/KeeperDispatcher.cpp b/src/Coordination/KeeperDispatcher.cpp
index 4c2ccb8db64..893bb8e6082 100644
--- a/src/Coordination/KeeperDispatcher.cpp
+++ b/src/Coordination/KeeperDispatcher.cpp
@@ -150,10 +150,11 @@ void KeeperDispatcher::requestThread()
                 {
                     LOG_WARNING(
                         log,
-                        "Processing requests refused because of max_memory_usage_soft_limit {}, the total used memory is {}, request type "
+                        "Processing requests refused because of max_memory_usage_soft_limit {}, the total allocated memory is {}, RSS is {}, request type "
                         "is {}",
                         ReadableSize(mem_soft_limit),
                         ReadableSize(total_memory_tracker.get()),
+                        ReadableSize(total_memory_tracker.getRSS()),
                         request.request->getOpNum());
                     addErrorResponses({request}, Coordination::Error::ZCONNECTIONLOSS);
                     continue;
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index d40e5ef2e50..ad9e8d32caa 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -599,7 +599,7 @@ bool KeeperServer::isLeaderAlive() const
 bool KeeperServer::isExceedingMemorySoftLimit() const
 {
     Int64 mem_soft_limit = keeper_context->getKeeperMemorySoftLimit();
-    return mem_soft_limit > 0 && total_memory_tracker.get() >= mem_soft_limit;
+    return mem_soft_limit > 0 && std::max(total_memory_tracker.get(), total_memory_tracker.getRSS()) >= mem_soft_limit;
 }
 
 /// TODO test whether taking failed peer in count