diff --git a/xbmc/interfaces/json-rpc/AudioLibrary.cpp b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
index 4b83b2f9191ce..64986fe96f2eb 100644
--- a/xbmc/interfaces/json-rpc/AudioLibrary.cpp
+++ b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
@@ -587,9 +587,11 @@ bool CAudioLibrary::FillFileItem(const CStdString &strFilename, CFileItemPtr &it
   }
 
   if (item->GetLabel().empty())
+  {
     item->SetLabel(CUtil::GetTitleFromPath(strFilename, false));
-  if (item->GetLabel())
-    item->SetLabel(URIUtils::GetFileName(strFilename));
+    if (item->GetLabel().empty())
+      item->SetLabel(URIUtils::GetFileName(strFilename));
+  }
 
   return true;
 }
diff --git a/xbmc/interfaces/json-rpc/VideoLibrary.cpp b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
index e6b7bc444d545..8b688b724826e 100644
--- a/xbmc/interfaces/json-rpc/VideoLibrary.cpp
+++ b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
@@ -700,9 +700,11 @@ bool CVideoLibrary::FillFileItem(const CStdString &strFilename, CFileItemPtr &it
 
   item->SetFromVideoInfoTag(details);
   if (item->GetLabel().empty())
+  {
     item->SetLabel(CUtil::GetTitleFromPath(strFilename, false));
-  if (item->GetLabel())
-    item->SetLabel(URIUtils::GetFileName(strFilename));
+    if (item->GetLabel().empty())
+      item->SetLabel(URIUtils::GetFileName(strFilename));
+  }
   return true;
 }