From 147ee8b1e7b18c4af4c290caeea21605c824abff Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Wed, 4 Mar 2026 09:09:07 -0500
Subject: [PATCH] resolve issue with Change Detection group

---
 Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs | 6 +++++-
 Oqtane.Server/Repository/SettingRepository.cs           | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs b/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs
index 24e3ed19..b3d4ac08 100644
--- a/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs
@@ -617,7 +617,11 @@ namespace Oqtane.Infrastructure
         private string SynchronizeModules(IServiceProvider provider, ISettingRepository settingRepository, IPageModuleRepository pageModuleRepository, IModuleRepository moduleRepository, SiteGroupMember siteGroupMember, List<PageModule> primaryPageModules, List<PageModule> secondaryPageModules, Page primaryPage, Page secondaryPage, int secondarySiteId)
         {
             var log = "";
-            var removePageModules = secondaryPageModules.Where(item => item.PageId == secondaryPage.PageId).ToList();
+            var removePageModules = new List<PageModule>();
+            if (secondaryPage != null)
+            {
+                removePageModules = secondaryPageModules.Where(item => item.PageId == secondaryPage.PageId).ToList();
+            }
 
             // iterate through primary modules on primary page
             foreach (var primaryPageModule in primaryPageModules.Where(item => item.PageId == primaryPage.PageId))
diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs
index f8bf4403..b2124298 100644
--- a/Oqtane.Server/Repository/SettingRepository.cs
+++ b/Oqtane.Server/Repository/SettingRepository.cs
@@ -1,14 +1,9 @@
-using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
-using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Models;
-using Oqtane.Modules.Admin.Users;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository