diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 66a5be3d..384290f9 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -533,7 +533,8 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                             <label>
                                 <input type="checkbox" name="notify_recently_added_grandparent" id="notify_recently_added_grandparent" value="1" ${config['notify_recently_added_grandparent']}> Group notifications for recently added TV Shows or Music
                             </label>
-                            <p class="help-block">Enable to only get one TV Show or Artist notification for recently added Episodes or Tracks. Movies are unaffected.</p>
+                            <p class="help-block">Enable to only get one TV Show or Artist notification for a batch of recently added Episodes or Tracks. Movies are unaffected.<br />
+                                Note: No Season/Episode or Album/Track metadata will be available.</p>
                         </div>
                         <div class="form-group">
                             <label for="notify_recently_added_delay">Notification Delay</label>
diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py
index 4d4560de..fdbe3f22 100644
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -408,6 +408,20 @@ def build_notify_text(session=None, timeline=None, state=None):
 
     progress_percent = helpers.get_percent(view_offset, duration)
 
+    # Fix metadata params for notify recently added grandparent
+    if plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT:
+        show_name = metadata['title']
+        episode_name = ''
+        artist_name = metadata['title']
+        album_name = ''
+        track_name = ''
+    else:
+        show_name = metadata['grandparent_title']
+        episode_name = metadata['title']
+        artist_name = metadata['grandparent_title']
+        album_name = metadata['parent_title']
+        track_name = metadata['title']
+    
     available_params = {'server_name': server_name,
                         'server_uptime': server_uptime,
                         'user': user,
@@ -416,11 +430,11 @@ def build_notify_text(session=None, timeline=None, state=None):
                         'ip_address': ip_address,
                         'media_type': metadata['media_type'],
                         'title': full_title,
-                        'show_name': metadata['grandparent_title'],
-                        'episode_name': metadata['title'],
-                        'artist_name': metadata['grandparent_title'],
-                        'album_name': metadata['parent_title'],
-                        'track_name': metadata['title'],
+                        'show_name': show_name,
+                        'episode_name': episode_name,
+                        'artist_name': artist_name,
+                        'album_name': album_name,
+                        'track_name': track_name,
                         'season_num': metadata['parent_index'].zfill(1),
                         'season_num00': metadata['parent_index'].zfill(2),
                         'episode_num': metadata['index'].zfill(1),