diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index fc59f67..3af454b 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -95,7 +95,8 @@ class SkinMinerva extends SkinTemplate {
 
 	/** @var array skin specific options */
 	protected $skinOptions = [
-		self::OPTION_AMC => false,
+		// Defaults to true for desktop mode.
+		self::OPTION_AMC => true,
 		self::OPTIONS_MOBILE_BETA => false,
 		/**
 		 * Whether the main menu should include a link to
@@ -1445,6 +1446,11 @@ class SkinMinerva extends SkinTemplate {
 	 */
 	public function addToBodyAttributes( $out, &$bodyAttrs ) {
 		$classes = $out->getProperty( 'bodyClassName' );
+		if ( $this->getSkinOption( self::OPTION_AMC ) ) {
+			$classes .= ' minerva--amc-enabled';
+		} else {
+			$classes .= ' minerva--amc-disabled';
+		}
 
 		$bodyAttrs[ 'class' ] .= ' ' . $classes;
 	}
diff --git a/tests/phpunit/skins/SkinMinervaTest.php b/tests/phpunit/skins/SkinMinervaTest.php
index 8e47a48..2267e4d 100644
--- a/tests/phpunit/skins/SkinMinervaTest.php
+++ b/tests/phpunit/skins/SkinMinervaTest.php
@@ -173,6 +173,9 @@ class SkinMinervaTest extends MediaWikiTestCase {
 		$moduleName, $expected
 	) {
 		$skin = new SkinMinerva();
+		$skin->setSkinOptions( [
+			SkinMinerva::OPTION_AMC => false,
+		] );
 		$title = Title::newFromText( 'Test' );
 		$testContext = RequestContext::getMain();
 		$testContext->setTitle( $title );