diff --git a/db-tabulator/app.ts b/db-tabulator/app.ts
index 37f4cf3..43b0023 100644
--- a/db-tabulator/app.ts
+++ b/db-tabulator/app.ts
@@ -456,6 +456,7 @@ export class Query {
 
 		const row_template = this.getTemplateValue('row_template');
 		const header_template = this.getTemplateValue('header_template');
+		const footer_template = this.getTemplateValue('footer_template');
 		const skip_table = this.getTemplateValue('skip_table');
 
 		let table: InstanceType<typeof Mwn.table>;
@@ -501,6 +502,10 @@ export class Query {
 			// but module does show a warning
 		}
 
+		if (skip_table && footer_template) {
+			tableText += '{{' + footer_template + '}}\n';
+		}
+
 		// Get DB replag, but no need to do this any more than once in 6 hours (when triggered via
 		// webservice or eventstream-router).
 		if (
@@ -613,6 +618,7 @@ export class Query {
 		}
 		let textToReplace = text.slice(
 			beginTemplateEndIdx,
+			// TODO: If end template not found, mention that in edit summary
 			endTemplateStartIdx === -1 ? undefined : endTemplateStartIdx
 		);
 		return text.slice(0, beginTemplateEndIdx) +