diff --git a/base/common/ReplxxLineReader.cpp b/base/common/ReplxxLineReader.cpp
index 251170ab5c1..1998242aff0 100644
--- a/base/common/ReplxxLineReader.cpp
+++ b/base/common/ReplxxLineReader.cpp
@@ -16,6 +16,19 @@ void trim(String & s)
     s.erase(std::find_if(s.rbegin(), s.rend(), [](int ch) { return !std::isspace(ch); }).base(), s.end());
 }
 
+// Uses separate replxx::Replxx instance to avoid loading them again in the
+// current context (replxx::Replxx::history_load() will re-load the history
+// from the file), since then they will overlaps with history from the current
+// session (this will make behavior compatible with other interpreters, i.e.
+// bash).
+void history_save(const String & history_file_path, const String & line)
+{
+    replxx::Replxx rx_no_overlap;
+    rx_no_overlap.history_load(history_file_path);
+    rx_no_overlap.history_add(line);
+    rx_no_overlap.history_save(history_file_path);
+}
+
 }
 
 ReplxxLineReader::ReplxxLineReader(
@@ -110,7 +123,7 @@ void ReplxxLineReader::addToHistory(const String & line)
     rx.history_add(line);
 
     // flush changes to the disk
-    rx.history_save(history_file_path);
+    history_save(history_file_path, line);
 
     if (locked && 0 != flock(history_file_fd, LOCK_UN))
         rx.print("Unlock of history file failed: %s\n", strerror(errno));