diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 9f7b4ff579..12ef0dcbe0 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2779,6 +2779,8 @@ void CApplication::UnloadSkin()
   g_colorManager.Clear();
 
   g_charsetConverter.reset();
+
+  g_infoManager.Clear();
 }
 
 bool CApplication::LoadUserWindows(const CStdString& strSkinPath)
@@ -4510,7 +4512,6 @@ HRESULT CApplication::Cleanup()
 #ifdef HAS_EVENT_SERVER
     CEventServer::RemoveInstance();
 #endif
-    g_infoManager.Clear();
     DllLoaderContainer::Clear();
     g_playlistPlayer.Clear();
     g_settings.Clear();
diff --git a/xbmc/utils/GUIInfoManager.cpp b/xbmc/utils/GUIInfoManager.cpp
index 43f3b6826e..87f8e87da7 100644
--- a/xbmc/utils/GUIInfoManager.cpp
+++ b/xbmc/utils/GUIInfoManager.cpp
@@ -3371,7 +3371,6 @@ int CGUIInfoManager::TranslateBooleanExpression(const CStdString &expression)
 
 void CGUIInfoManager::Clear()
 {
-  m_currentFile->Reset();
   m_CombinedValues.clear();
 }