diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
index 1a02b9ff39fc..e4f9f05d41ff 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
@@ -176,7 +176,11 @@ def get_transceiver_change_event(self, timeout=0):
         if 'LIVENESS' not in keys:
             return False, phy_port_dict
 
-        (state, c) = self.db_sel.select(timeout)
+        if timeout:
+            (state, c) = self.db_sel.select(timeout)
+        else:
+            (state, c) = self.db_sel.select()
+
         if state == self.db_sel_timeout:
             status = True
         elif state != self.db_sel_object:
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index edbfeec663f3..e8caaead527d 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit edbfeec663f32585cbf3468a88deb950fed3bb69
+Subproject commit e8caaead527d46d42e41e99b884f41c57f70018b