diff --git a/src/ssb.db.c b/src/ssb.db.c
index 2626a601..8a683167 100644
--- a/src/ssb.db.c
+++ b/src/ssb.db.c
@@ -87,6 +87,26 @@ static int _tf_ssb_db_busy_handler(void* user_data, int count)
 	return 1;
 }
 
+static int _tf_ssb_db_wal_hook(void* user_data, sqlite3* db, const char* db_name, int log_pages)
+{
+	/* Keeps the log below about 64MB with default 4096 byte pages. */
+	if (log_pages >= 16384)
+	{
+		int log = 0;
+		int checkpointed = 0;
+		uint64_t checkpoint_start_ns = uv_hrtime();
+		if (sqlite3_wal_checkpoint_v2(db, NULL, SQLITE_CHECKPOINT_TRUNCATE, &log, &checkpointed) == SQLITE_OK)
+		{
+			tf_printf("Checkpointed %d pages in %d ms.  Log is now %d frames.\n", log_pages, (int)((uv_hrtime() - checkpoint_start_ns) / 1000000LL), log);
+		}
+		else
+		{
+			tf_printf("Checkpoint: %s.\n", sqlite3_errmsg(db));
+		}
+	}
+	return SQLITE_OK;
+}
+
 static void _tf_ssb_db_init_internal(sqlite3* db)
 {
 	sqlite3_extended_result_codes(db, 1);
@@ -104,6 +124,7 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 {
 	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
 	_tf_ssb_db_init_internal(db);
+	sqlite3_wal_hook(db, _tf_ssb_db_wal_hook, NULL);
 
 	sqlite3_stmt* statement = NULL;
 	int auto_vacuum = 0;
diff --git a/src/ssb.rpc.c b/src/ssb.rpc.c
index ce6c1c5d..7203ecde 100644
--- a/src/ssb.rpc.c
+++ b/src/ssb.rpc.c
@@ -1463,23 +1463,6 @@ static void _tf_ssb_rpc_broadcasts_changed_callback(tf_ssb_t* ssb, void* user_da
 	tf_ssb_visit_broadcasts(ssb, _tf_ssb_rpc_broadcasts_changed_visit, ssb);
 }
 
-static void _tf_ssb_rpc_checkpoint(tf_ssb_t* ssb)
-{
-	int64_t checkpoint_start_ms = uv_hrtime();
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-	int log = 0;
-	int checkpointed = 0;
-	if (sqlite3_wal_checkpoint_v2(db, NULL, SQLITE_CHECKPOINT_PASSIVE, &log, &checkpointed) == SQLITE_OK)
-	{
-		tf_printf("Checkpointed %d frames in %d ms.  Log is now %d frames.\n", checkpointed, (int)((uv_hrtime() - checkpoint_start_ms) / 1000000LL), log);
-	}
-	else
-	{
-		tf_printf("Checkpoint: %s.\n", sqlite3_errmsg(db));
-	}
-	tf_ssb_release_db_writer(ssb, db);
-}
-
 typedef struct _delete_t
 {
 	int deleted;
@@ -1495,7 +1478,6 @@ static void _tf_ssb_rpc_delete_blobs_work(tf_ssb_t* ssb, void* user_data)
 	tf_ssb_release_db_reader(ssb, db);
 	if (age <= 0)
 	{
-		_tf_ssb_rpc_checkpoint(ssb);
 		return;
 	}
 	int64_t start_ns = uv_hrtime();
@@ -1546,7 +1528,6 @@ static void _tf_ssb_rpc_delete_blobs_work(tf_ssb_t* ssb, void* user_data)
 	tf_ssb_release_db_writer(ssb, db);
 	delete->duration_ms = (uv_hrtime() - start_ns) / 1000000LL;
 	tf_printf("Deleted %d blobs in %d ms.\n", deleted, (int)delete->duration_ms);
-	_tf_ssb_rpc_checkpoint(ssb);
 }
 
 static void _tf_ssb_rpc_delete_blobs_after_work(tf_ssb_t* ssb, int status, void* user_data)
@@ -1632,7 +1613,6 @@ static void _tf_ssb_rpc_delete_feeds_work(tf_ssb_t* ssb, void* user_data)
 
 	delete->duration_ms = (uv_hrtime() - start_ns) / 1000000LL;
 	tf_printf("Deleted %d message in %d ms.\n", delete->deleted, (int)delete->duration_ms);
-	_tf_ssb_rpc_checkpoint(ssb);
 }
 
 static void _tf_ssb_rpc_delete_feeds_after_work(tf_ssb_t* ssb, int status, void* user_data)