diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index b2e23682b3..1f58000fef 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -169,15 +169,7 @@ namespace MediaBrowser.Providers.Manager
         /// <returns>ItemUpdateType.</returns>
         protected virtual ItemUpdateType BeforeSave(TItemType item)
         {
-            var updateType = ItemUpdateType.None;
-
-            if (string.IsNullOrEmpty(item.Name) && !string.IsNullOrEmpty(item.Path))
-            {
-                item.Name = Path.GetFileNameWithoutExtension(item.Path);
-                updateType = updateType | ItemUpdateType.MetadataDownload;
-            }
-
-            return updateType;
+            return ItemUpdateType.None;
         }
 
         /// <summary>
@@ -311,11 +303,6 @@ namespace MediaBrowser.Providers.Manager
                             refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.ImageUpdate;
                         }
 
-                        if (string.IsNullOrWhiteSpace(localItem.Item.Name))
-                        {
-                            localItem.Item.Name = item.Name ?? Path.GetFileNameWithoutExtension(item.Path);
-                        }
-
                         MergeData(localItem.Item, temp, new List<MetadataFields>(), !options.ReplaceAllMetadata, true);
                         refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataImport;
 
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs
index 67536ac5ff..d77a545d8e 100644
--- a/MediaBrowser.Providers/Manager/ProviderUtils.cs
+++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs
@@ -1,7 +1,7 @@
-using System;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Model.Entities;
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Providers.Manager
@@ -14,7 +14,11 @@ namespace MediaBrowser.Providers.Manager
             {
                 if (replaceData || string.IsNullOrEmpty(target.Name))
                 {
-                    target.Name = source.Name;
+                    // Safeguard against incoming data having an emtpy name
+                    if (!string.IsNullOrWhiteSpace(source.Name))
+                    {
+                        target.Name = source.Name;
+                    }
                 }
             }