diff --git a/src/Orchard.Web/Core/Settings/Services/SiteService.cs b/src/Orchard.Web/Core/Settings/Services/SiteService.cs
index 2c8754632..603994413 100644
--- a/src/Orchard.Web/Core/Settings/Services/SiteService.cs
+++ b/src/Orchard.Web/Core/Settings/Services/SiteService.cs
@@ -43,11 +43,7 @@ namespace Orchard.Core.Settings.Services {
                 return site.Id;
             });
 
-            return _contentManager.Query<SiteSettingsPart, SiteSettingsPartRecord>(VersionOptions.Published)
-                                  .WithQueryHintsFor("Site")
-                                  .Where(s => s.Id == siteId)
-                                  .List()
-                                  .First();
+            return _contentManager.Get<ISite>(siteId, VersionOptions.Published, new QueryHints().ExpandRecords<SiteSettingsPartRecord>());
         }
     }
 }
\ No newline at end of file