diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py
index 2c766c55..e6d77f79 100644
--- a/plexpy/activity_handler.py
+++ b/plexpy/activity_handler.py
@@ -275,13 +275,13 @@ class ActivityHandler(object):
                         elif this_state == 'stopped':
                             self.on_stop()
 
-                    elif this_state == 'buffering':
-                        self.on_buffer()
-
                     elif this_state == 'paused':
                         # Update the session last_paused timestamp
                         self.on_pause(still_paused=True)
 
+                    if this_state == 'buffering':
+                        self.on_buffer()
+
                     if this_transcode_key != last_transcode_key and this_state != 'buffering':
                         self.on_change()