diff --git a/package.json b/package.json
index ec00b934..bf03ea5d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "Calvin Montgomery",
   "name": "CyTube",
   "description": "Online media synchronizer and chat",
-  "version": "3.51.12",
+  "version": "3.51.13",
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },
diff --git a/src/channel-storage/dbstore.js b/src/channel-storage/dbstore.js
index c6deba6d..3475619a 100644
--- a/src/channel-storage/dbstore.js
+++ b/src/channel-storage/dbstore.js
@@ -10,10 +10,18 @@ const loadRowcount = new Counter({
     name: 'cytube_channel_db_load_rows_total',
     help: 'Total rows loaded from the channel_data table'
 });
+const loadCharcount = new Counter({
+    name: 'cytube_channel_db_load_chars_total',
+    help: 'Total characters (JSON length) loaded from the channel_data table'
+});
 const saveRowcount = new Counter({
     name: 'cytube_channel_db_save_rows_total',
     help: 'Total rows saved in the channel_data table'
 });
+const saveCharcount = new Counter({
+    name: 'cytube_channel_db_save_chars_total',
+    help: 'Total characters (JSON length) saved in the channel_data table'
+});
 
 function queryAsync(query, substitutions) {
     return new Promise((resolve, reject) => {
@@ -54,6 +62,7 @@ export class DatabaseStore {
             rows.forEach(row => {
                 try {
                     data[row.key] = JSON.parse(row.value);
+                    loadCharcount.inc(row.value.length);
                 } catch (e) {
                     LOGGER.error(`Channel data for channel "${channelName}", ` +
                             `key "${row.key}" is invalid: ${e}`);
@@ -95,8 +104,6 @@ export class DatabaseStore {
             return;
         }
 
-        saveRowcount.inc(rowCount);
-
         if (totalSize > SIZE_LIMIT) {
             throw new ChannelStateSizeError(
                     'Channel state size is too large', {
@@ -105,6 +112,9 @@ export class DatabaseStore {
             });
         }
 
+        saveRowcount.inc(rowCount);
+        saveCharcount.inc(totalSize);
+
         return await queryAsync(buildUpdateQuery(rowCount), substitutions);
     }
 }
diff --git a/src/channel/channel.js b/src/channel/channel.js
index 63a2b8a4..096f8866 100644
--- a/src/channel/channel.js
+++ b/src/channel/channel.js
@@ -10,7 +10,6 @@ import Promise from 'bluebird';
 import { EventEmitter } from 'events';
 import { throttle } from '../util/throttle';
 import Logger from '../logger';
-import * as Switches from '../switches';
 
 const LOGGER = require('@calzoneman/jsli')('channel');
 
@@ -260,7 +259,6 @@ Channel.prototype.saveState = async function () {
     Object.keys(this.modules).forEach(m => {
         if (
             this.modules[m].dirty ||
-            !Switches.isActive('dirtyCheck') ||
             !this.modules[m].supportsDirtyCheck
         ) {
             this.modules[m].save(data);
diff --git a/src/channel/playlist.js b/src/channel/playlist.js
index c778cbb2..65a342ef 100644
--- a/src/channel/playlist.js
+++ b/src/channel/playlist.js
@@ -10,6 +10,7 @@ var CustomEmbedFilter = require("../customembed").filter;
 var XSS = require("../xss");
 import counters from '../counters';
 import { Counter } from 'prom-client';
+import * as Switches from '../switches';
 
 const LOGGER = require('@calzoneman/jsli')('playlist');
 
@@ -107,19 +108,45 @@ function PlaylistModule(channel) {
         this.channel.modules.chat.registerCommand("/clean", this.handleClean.bind(this));
         this.channel.modules.chat.registerCommand("/cleantitle", this.handleClean.bind(this));
     }
+
+    this.supportsDirtyCheck = true;
+    this._positionDirty = false;
+    this._listDirty = false;
 }
 
 PlaylistModule.prototype = Object.create(ChannelModule.prototype);
 
+Object.defineProperty(PlaylistModule.prototype, "dirty", {
+    get() {
+        return this._positionDirty || this._listDirty || !Switches.isActive("plDirtyCheck");
+    },
+
+    set(val) {
+        this._positionDirty = this._listDirty = val;
+    }
+});
+
 PlaylistModule.prototype.load = function (data) {
     var self = this;
-    var playlist = data.playlist;
-    if (typeof playlist !== "object" || !("pl" in playlist)) {
+    let { playlist, playlistPosition } = data;
+
+    if (typeof playlist !== "object" || !playlist.hasOwnProperty("pl")) {
+        LOGGER.warn(
+            "Bad playlist for channel %s",
+            self.channel.uniqueName
+        );
         return;
     }
 
-    var i = 0;
-    playlist.pos = parseInt(playlist.pos);
+    if (!playlistPosition) {
+        // Old style playlist
+        playlistPosition = {
+            index: playlist.pos,
+            time: playlist.time
+        };
+    }
+
+    let i = 0;
     playlist.pl.forEach(function (item) {
         if (item.media.type === "cu" && item.media.id.indexOf("cu:") !== 0) {
             try {
@@ -142,14 +169,15 @@ PlaylistModule.prototype.load = function (data) {
         self.items.append(newitem);
         self.meta.count++;
         self.meta.rawTime += m.seconds;
-        if (playlist.pos === i) {
+        if (playlistPosition.index === i) {
             self.current = newitem;
         }
         i++;
     });
 
     self.meta.time = util.formatTime(self.meta.rawTime);
-    self.startPlayback(playlist.time);
+    self.startPlayback(playlistPosition.time);
+    self.dirty = false;
 };
 
 PlaylistModule.prototype.save = function (data) {
@@ -167,11 +195,18 @@ PlaylistModule.prototype.save = function (data) {
         time = this.current.media.currentTime;
     }
 
-    data.playlist = {
-        pl: arr,
-        pos: pos,
-        time: time
-    };
+    if (Switches.isActive("plDirtyCheck")) {
+        data.playlistPosition = {
+            index: pos,
+            time
+        };
+
+        if (this._listDirty) {
+            data.playlist = { pl: arr };
+        }
+    } else {
+        data.playlist = { pl: arr, pos, time };
+    }
 };
 
 PlaylistModule.prototype.unload = function () {
@@ -585,6 +620,7 @@ PlaylistModule.prototype.handleSetTemp = function (user, data) {
 
     item.temp = data.temp;
     this.channel.broadcastAll("setTemp", data);
+    this._listDirty = true;
 
     if (!data.temp && this.channel.modules.library) {
         this.channel.modules.library.cacheMedia(item.media);
@@ -633,6 +669,7 @@ PlaylistModule.prototype.handleMoveMedia = function (user, data) {
         self.channel.logger.log("[playlist] " + user.getName() + " moved " +
                                 from.media.title +
                                 (after ? " after " + after.media.title : ""));
+        self._listDirty = true;
         lock.release();
         self.channel.refCounter.unref("PlaylistModule::handleMoveMedia");
     });
@@ -698,6 +735,8 @@ PlaylistModule.prototype.handleClear = function (user) {
 
     this.channel.broadcastAll("playlist", []);
     this.channel.broadcastAll("setPlaylistMeta", this.meta);
+    this._listDirty = true;
+    this._positionDirty = true;
 };
 
 PlaylistModule.prototype.handleShuffle = function (user) {
@@ -721,6 +760,8 @@ PlaylistModule.prototype.handleShuffle = function (user) {
         this.items.append(item);
         pl.splice(i, 1);
     }
+    this._listDirty = true;
+    this._positionDirty = true;
 
     this.current = this.items.first;
     pl = this.items.toArray(true);
@@ -821,6 +862,7 @@ PlaylistModule.prototype.handleUpdate = function (user, data) {
     media.currentTime = data.currentTime;
     media.paused = Boolean(data.paused);
     var update = media.getTimeUpdate();
+    this._positionDirty = true;
 
     this.channel.broadcastAll("mediaUpdate", update);
 };
@@ -860,6 +902,8 @@ PlaylistModule.prototype._delete = function (uid) {
         self.startPlayback();
     }
 
+    self._listDirty = true;
+
     return success;
 };
 
@@ -976,6 +1020,8 @@ PlaylistModule.prototype._addItem = function (media, data, user, cb) {
             self.startPlayback();
         }
 
+        self._listDirty = true;
+
         if (cb) {
             cb();
         }
@@ -1016,6 +1062,7 @@ PlaylistModule.prototype.startPlayback = function (time) {
 
     var media = self.current.media;
     media.reset();
+    self._positionDirty = true;
 
     if (self.leader != null) {
         media.paused = false;
@@ -1094,6 +1141,8 @@ PlaylistModule.prototype._leadLoop = function() {
         return;
     }
 
+    this._positionDirty = true;
+
     var dt = (Date.now() - this._lastUpdate) / 1000.0;
     var t = this.current.media.currentTime;