diff --git a/Frameworks/ArticlesDatabase/ArticlesTable.swift b/Frameworks/ArticlesDatabase/ArticlesTable.swift
index 6c505ace3..6d9b6945d 100644
--- a/Frameworks/ArticlesDatabase/ArticlesTable.swift
+++ b/Frameworks/ArticlesDatabase/ArticlesTable.swift
@@ -428,6 +428,9 @@ final class ArticlesTable: DatabaseTable {
 	// MARK: - Indexing
 
 	func indexUnindexedArticles() {
+		guard !queue.isSuspended else {
+			return
+		}
 		queue.runInDatabase { (database) in
 			let sql = "select articleID from articles where searchRowID is null limit 500;"
 			guard let resultSet = database.executeQuery(sql, withArgumentsIn: nil) else {
diff --git a/Frameworks/ArticlesDatabase/SearchTable.swift b/Frameworks/ArticlesDatabase/SearchTable.swift
index 8007b366d..da0d35d2d 100644
--- a/Frameworks/ArticlesDatabase/SearchTable.swift
+++ b/Frameworks/ArticlesDatabase/SearchTable.swift
@@ -70,7 +70,7 @@ final class SearchTable: DatabaseTable {
 	}
 
 	func ensureIndexedArticles(for articleIDs: Set<String>) {
-		if articleIDs.isEmpty {
+		guard !queue.isSuspended && !articleIDs.isEmpty else {
 			return
 		}
 		queue.runInTransaction { (database) in