diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py
index dde48eae21..a27292ea2a 100644
--- a/pokemongo_bot/__init__.py
+++ b/pokemongo_bot/__init__.py
@@ -101,16 +101,18 @@ def __init__(self, config):
 
         self.capture_locked = False  # lock catching while moving to VIP pokemon
 
-        client_id_file_path = os.path.join(_base_dir, 'data', 'mqtt_client_id')
-        saved_info = shelve.open(client_id_file_path)
-        if saved_info.has_key('client_id'):
-            self.config.client_id = saved_info['client_id']
-        else:
-            client_uuid = uuid.uuid4()
-            self.config.client_id = str(client_uuid)
-            saved_info['client_id'] = self.config.client_id
-        saved_info.close()
-
+        #client_id_file_path = os.path.join(_base_dir, 'data', 'mqtt_client_id')
+        #saved_info = shelve.open(client_id_file_path)
+        #if saved_info.has_key('client_id'):
+        #    self.config.client_id = saved_info['client_id']
+        #else:
+        #    client_uuid = uuid.uuid4()
+        #    self.config.client_id = str(client_uuid)
+        #    saved_info['client_id'] = self.config.client_id
+        #saved_info.close()
+        # There's issue report, just disable this part.
+        client_uuid = uuid.uuid4()
+        self.config.client_id = str(client_uuid)
     def start(self):
         self._setup_event_system()
         self._setup_logging()
diff --git a/pokemongo_bot/health_record/bot_event.py b/pokemongo_bot/health_record/bot_event.py
index 28d3943a52..d967b7c0ba 100644
--- a/pokemongo_bot/health_record/bot_event.py
+++ b/pokemongo_bot/health_record/bot_event.py
@@ -16,15 +16,17 @@ class BotEvent(object):
     def __init__(self, config):
         self.config = config
         self.logger = logging.getLogger(__name__)
-        client_id_file_path = os.path.join(_base_dir, 'data', 'client_id')
-        saved_info = shelve.open(client_id_file_path)
-        if saved_info.has_key('client_id'):
-            self.client_id = saved_info['client_id']
-        else:
-            client_uuid = uuid.uuid4()
-            self.client_id = str(client_uuid)
-            saved_info['client_id'] = self.client_id
-        saved_info.close()
+        #client_id_file_path = os.path.join(_base_dir, 'data', 'client_id')
+        #saved_info = shelve.open(client_id_file_path)
+        #if saved_info.has_key('client_id'):
+        #    self.client_id = saved_info['client_id']
+        #else:
+        #    client_uuid = uuid.uuid4()
+        #    self.client_id = str(client_uuid)
+        #    saved_info['client_id'] = self.client_id
+        #saved_info.close()
+        client_uuid = uuid.uuid4()
+        self.client_id = str(client_uuid)
         # UniversalAnalytics can be reviewed here:
         # https://github.com/analytics-pros/universal-analytics-python
         if self.config.health_record: