diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py
index 1020b047..bc7318d6 100644
--- a/plexpy/activity_handler.py
+++ b/plexpy/activity_handler.py
@@ -223,8 +223,8 @@ class ActivityHandler(object):
                              (self.get_session_key(), buffer_last_triggered))
                 time_since_last_trigger = int(time.time()) - int(buffer_last_triggered)
 
-            if plexpy.CONFIG.BUFFER_THRESHOLD > 0 and (current_buffer_count >= plexpy.CONFIG.BUFFER_THRESHOLD and \
-                time_since_last_trigger is None or time_since_last_trigger >= plexpy.CONFIG.BUFFER_WAIT):
+            if current_buffer_count >= plexpy.CONFIG.BUFFER_THRESHOLD and time_since_last_trigger is None or \
+                    time_since_last_trigger >= plexpy.CONFIG.BUFFER_WAIT:
                 ap.set_session_buffer_trigger_time(session_key=self.get_session_key())
 
                 # Retrieve the session data from our temp table
diff --git a/plexpy/config.py b/plexpy/config.py
index 934e3ec6..8b9d92db 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -916,7 +916,6 @@ class Config(object):
             self.CONFIG_VERSION = 12
 
         if self.CONFIG_VERSION == 12:
-            if self.BUFFER_THRESHOLD == 3:
-                self.BUFFER_THRESHOLD = 10
+            self.BUFFER_THRESHOLD = max(self.BUFFER_THRESHOLD, 10)
 
             self.CONFIG_VERSION = 13