diff --git a/src/modules/core.js b/src/modules/core.js
index 4d2776a2..e33265c8 100644
--- a/src/modules/core.js
+++ b/src/modules/core.js
@@ -1710,6 +1710,11 @@
 			// delete |class= from banners in array
 			banners = banners.map( ( value ) => value.replace( /\s*\|\s*class\s*=\s*[^|}]*([\n|}])/, '$1' ) );
 
+			// The banner shell automatically detects several classes. If it's one of these auto detected classes, write |class= blank instead of writing the class.
+			if ( [ 'Disambig', 'Template', 'Redirect', 'Portal', 'Project', 'NA' ].indexOf( newAssessment ) !== -1 ) {
+				newAssessment = '';
+			}
+
 			// Convert array back to wikitext and append to top of talk page.
 			// Always add a shell even if it's just wrapping one banner, for code simplification reasons.
 			// Add |class= to shell.
diff --git a/tests/test-core.js b/tests/test-core.js
index 751c1dc0..e6007848 100644
--- a/tests/test-core.js
+++ b/tests/test-core.js
@@ -382,13 +382,29 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell |class=Disambig |1=
+`{{WikiProject banner shell |1=
 {{subst:WPAFC/article |oldid=592681}}
 {{WikiProject Disambiguation}}
 }}`
 		);
 	} );
 
+	it( 'don\'t write a |class= if the banner shell can auto detect it. Examples: Template, Portal, Disambig, etc.', () => {
+		const wikicode = '';
+		const newAssessment = 'Template';
+		const revId = 592681;
+		const isBiography = false;
+		const newWikiProjects = [];
+		const lifeStatus = 'unknown';
+		const subjectName = '';
+		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
+		expect( output ).toBe(
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592681}}
+}}`
+		);
+	} );
+
 	it( 'has {{OKA}} banner and puts it in the banner shell', () => {
 		const wikicode =
 `{{translated page|pl|Katowice Załęże|version=|small=no|insertversion=|section=}}{{OKA}}`;