diff --git a/DnsServerCore/Dhcp/DhcpServer.cs b/DnsServerCore/Dhcp/DhcpServer.cs
index dfafa7ca..cf3353c3 100644
--- a/DnsServerCore/Dhcp/DhcpServer.cs
+++ b/DnsServerCore/Dhcp/DhcpServer.cs
@@ -134,9 +134,6 @@ namespace DnsServerCore.Dhcp
 
                 if (_maintenanceTimer != null)
                     _maintenanceTimer.Dispose();
-
-                SaveModifiedScopes();
-                SaveModifiedDnsAuthZones();
             }
 
             _disposed = true;
@@ -1203,6 +1200,9 @@ namespace DnsServerCore.Dhcp
 
             StopMaintenanceTimer();
 
+            SaveModifiedScopes();
+            SaveModifiedDnsAuthZones();
+
             foreach (KeyValuePair<string, Scope> scope in _scopes)
                 UnloadScope(scope.Value);