diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py
index 24485fc5..2b91cc85 100644
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -169,15 +169,22 @@ def notify(stream_data=None, notify_action=None):
 
 def notify_timeline(timeline_data=None, notify_action=None):
     if timeline_data and notify_action:
-        for agent in notifiers.available_notification_agents():
-            if agent['on_created'] and notify_action == 'created':
-                # Build and send notification
-                notify_strings = build_notify_text(timeline=timeline_data, state=notify_action)
-                notifiers.send_notification(config_id=agent['id'],
-                                            subject=notify_strings[0],
-                                            body=notify_strings[1])
-                # Set the notification state in the db
-                set_notify_state(session=timeline_data, state=notify_action, agent_info=agent)
+        if (timeline_data['media_type'] == 'movie' and plexpy.CONFIG.MOVIE_NOTIFY_ENABLE) \
+            or ((timeline_data['media_type'] == 'show' or timeline_data['media_type'] == 'episode') \
+                and plexpy.CONFIG.TV_NOTIFY_ENABLE) \
+            or ((timeline_data['media_type'] == 'artist' or timeline_data['media_type'] == 'track') \
+                and plexpy.CONFIG.MUSIC_NOTIFY_ENABLE):
+
+            for agent in notifiers.available_notification_agents():
+                if agent['on_created'] and notify_action == 'created':
+                    # Build and send notification
+                    notify_strings = build_notify_text(timeline=timeline_data, state=notify_action)
+                    notifiers.send_notification(config_id=agent['id'],
+                                                subject=notify_strings[0],
+                                                body=notify_strings[1])
+                    # Set the notification state in the db
+                    set_notify_state(session=timeline_data, state=notify_action, agent_info=agent)
+
     elif not timeline_data and notify_action:
         for agent in notifiers.available_notification_agents():
             if agent['on_extdown'] and notify_action == 'extdown':