diff --git a/components/components-core.php b/components/components-core.php
index 5b8a2ede6..0b777fb7a 100644
--- a/components/components-core.php
+++ b/components/components-core.php
@@ -360,6 +360,10 @@ function ampforwp_sanitize_archive_desc(){
     }
     if( true == ampforwp_get_setting('amp-rtl-select-option') ){
     	$bodyClass .= ' rtl ';
+    }
+    $lightbox = '';
+    if( false == ampforwp_get_setting('ampforwp-amp-img-lightbox') ){
+    	$lightbox = 'data-amp-auto-lightbox-disable';
     }
 	?><!doctype html>
 	<html <?php echo esc_attr(ampforwp_amp_nonamp_convert('amp ')); ?><?php echo AMP_HTML_Utils::build_attributes_string( $thisTemplate->get( 'html_tag_attributes' ) ); ?>>
@@ -391,7 +395,7 @@ function ampforwp_sanitize_archive_desc(){
 			<?php do_action('ampforwp_before_head', $thisTemplate);  ?>
 			<?php do_action('ampforwp_last_head', $thisTemplate);  ?>
 		</head>
-		<body <?php ampforwp_body_class($bodyClass); ?>>
+		<body <?php echo $lightbox; ?> <?php ampforwp_body_class($bodyClass); ?>>
 		<?php do_action('amp_start', $thisTemplate); ?>
 		<?php do_action('ampforwp_body_beginning', $thisTemplate);  
 }
