diff --git a/picture.php b/picture.php
index 7c2f54dda..115c72048 100644
--- a/picture.php
+++ b/picture.php
@@ -606,7 +606,7 @@ $metadata_showable = trigger_change(
   $picture['current']
   );
 
-if ( $metadata_showable and pwg_get_session_var('show_metadata') )
+if ( isset($_GET['metadata']) )
 {
   $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
 }
@@ -676,12 +676,10 @@ SELECT *
       
       $format['filesize'] = sprintf('%.1fMB', $format['filesize']/1024);
     }
-
     $template->append('current', array('formats' => $formats), true);
   }
 }
 
-
 if ($page['slideshow'])
 {
   $tpl_slideshow = array();