diff --git a/Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs b/Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs
index 4764647e..f5f1806b 100644
--- a/Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs
+++ b/Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs
@@ -43,8 +43,7 @@ namespace Oqtane.Managers.Search
 
             foreach(var pageModule in pageModules)
             {
-                var page = _pageRepository.GetPage(pageModule.PageId);
-                if(page == null || SearchUtils.IsSystemPage(page))
+                if(pageModule.Page == null || SearchUtils.IsSystemPage(pageModule.Page))
                 {
                     continue;
                 }