1 files changed, 4 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 9bc0bb945..a5bb47afb 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -125,6 +125,9 @@ namespace Emby.Server.Implementations.Data
 
             WriteConnection.Execute("PRAGMA temp_store=" + (int)TempStore);
 
+            // Configuration and pragmas can affect VACUUM so it needs to be last.
+            WriteConnection.Execute("VACUUM");
+
             return new ManagedConnection(WriteConnection, WriteLock);
         }
 
@@ -215,7 +218,7 @@ namespace Emby.Server.Implementations.Data
                 WriteLock.Wait();
                 try
                 {
-                    WriteConnection.Dispose();
+                    WriteConnection?.Dispose();
                 }
                 finally
                 {