diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index 668ac1ba02ff91150cac7bf42dbf76eccc7002e3..bbc4ad150b48a6bee0473df4478e3dad896a7670 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 c226abf56b961f1a8de61608bc69b01532e0f404..ebb56af80904fab92ab4703f88f3fa189befefee 100644
--- a/cpp/src/db/MySQLMetaImpl.cpp
+++ b/cpp/src/db/MySQLMetaImpl.cpp
@@ -162,7 +162,9 @@ namespace meta {
 
             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);
             }