diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index ac3b2c51f65c27910652992830ebb29fe4fbc4bf..19fbbe9c0cfa421b559dbd588ae1f9a29808692b 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -25,6 +25,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-90 - Fix arch match incorrect on ARM
 - MS-99 - Fix compilation bug
 - MS-110 - Avoid huge file size
+- MS-148 - Disable cleanup if mode is read only
 
 ## Improvement
 - MS-82 - Update server startup welcome message
diff --git a/cpp/src/db/MySQLMetaImpl.cpp b/cpp/src/db/MySQLMetaImpl.cpp
index 92bb17168a58d37a9b53c87662556db9f76d62ee..20b0cef0c68800d29999b91a3fd982b787e4971c 100644
--- a/cpp/src/db/MySQLMetaImpl.cpp
+++ b/cpp/src/db/MySQLMetaImpl.cpp
@@ -162,7 +162,9 @@ namespace meta {
             ENGINE_LOG_DEBUG << "MySQL connection pool: maximum pool size = " << std::to_string(maxPoolSize);
             try {
 
-                CleanUp();
+                if (mode_ != Options::MODE::READ_ONLY) {
+                    CleanUp();
+                }
 
                 {
                     ScopedConnection connectionPtr(*mysql_connection_pool_, safe_grab);
@@ -457,7 +459,7 @@ namespace meta {
             } //Scoped Connection
 
 
-            if (mode_ != Options::MODE::SINGLE) {
+            if (mode_ == Options::MODE::CLUSTER) {
                 DeleteTableFiles(table_id);
             }