diff --git a/templates/images.html b/templates/images.html
index e27f839..04eadf3 100755
--- a/templates/images.html
+++ b/templates/images.html
@@ -8,6 +8,13 @@
     {{ end }}
     <title>{{ .Query }} - {{ translate "site_name" }}</title>
     <link rel="stylesheet" href="/static/css/style.css">
+    <noscript>
+        <style>
+            img.placeholder-img {
+                display: none;
+            }
+        </style>
+    </noscript>
     <link rel="stylesheet" href="/static/css/style-fixedwidth.css">
     <link rel="stylesheet" href="/static/css/{{.Theme}}.css">
     <link rel="search" type="application/opensearchdescription+xml" title="{{ translate "site_name" }}" href="/opensearch.xml">    
@@ -185,16 +192,14 @@
                     </noscript>
                     
                     <!-- JavaScript is enabled; use placeholders -->
-                    <div id="content" class="js-enabled">
-                        <img
-                            src="/static/images/placeholder.svg"
-                            data-id="{{ $result.ID }}"
-                            data-full="{{ $result.ProxyFull }}"
-                            data-proxy-full="{{ $result.ProxyThumb }}"
-                            alt="{{ $result.Title }}"
-                            class="clickable"
-                        />
-                    </div>
+                    <img
+                        src="/static/images/placeholder.svg"
+                        data-id="{{ $result.ID }}"
+                        data-full="{{ $result.ProxyFull }}"
+                        data-proxy-full="{{ $result.ProxyThumb }}"
+                        alt="{{ $result.Title }}"
+                        class="clickable placeholder-img"
+                    />
                 {{ else }}
                     <!-- HardCacheEnabled is false; serve images directly -->
                     <img src="{{ $result.ProxyFull }}" alt="{{ $result.Title }}" class="clickable" />
@@ -216,10 +221,10 @@
             <!-- Nav buttons -->
             <div class="pagination">
                 {{ if .HasPrevPage }}
-                    <a href="/search?q={{ .Query }}&t=image&p={{ sub .Page 1 }}&js_disabled=true">{{ translate "previous" }}</a>
+                    <a href="/search?q={{ .Query }}&t=image&p={{ sub .Page 1 }}">{{ translate "previous" }}</a>
                 {{ end }}
                 {{ if .HasNextPage }}
-                    <a href="/search?q={{ .Query }}&t=image&p={{ add .Page 1 }}&js_disabled=true">{{ translate "next" }}</a>
+                    <a href="/search?q={{ .Query }}&t=image&p={{ add .Page 1 }}">{{ translate "next" }}</a>
                 {{ end }}
             </div>
         </noscript>        
diff --git a/templates/images_only.html b/templates/images_only.html
index 765045b..e51dbe6 100644
--- a/templates/images_only.html
+++ b/templates/images_only.html
@@ -1,21 +1,28 @@
 {{ range $index, $result := .Results }}
 <div class="image">
-    <img
-        {{if $.HardCacheEnabled}}
+    {{ if $.HardCacheEnabled }}
+        <noscript>
+            <!-- JavaScript is disabled; serve actual images -->
+            <img src="{{ $result.ProxyFull }}" alt="{{ $result.Title }}" class="clickable" />
+        </noscript>
+
+        <!-- JavaScript is enabled; use placeholders -->
+        <img
             src="/static/images/placeholder.svg"
             data-id="{{ $result.ID }}"
             data-full="{{ $result.ProxyFull }}"
             data-proxy-full="{{ $result.ProxyThumb }}"
-        {{else}}
-            src="{{ $result.ProxyFull }}"
-        {{end}}
-        alt="{{ $result.Title }}"
-        class="clickable"
-    />
+            alt="{{ $result.Title }}"
+            class="clickable placeholder-img"
+        />
+    {{ else }}
+        <!-- HardCacheEnabled is false; serve images directly -->
+        <img src="{{ $result.ProxyFull }}" alt="{{ $result.Title }}" class="clickable" />
+    {{ end }}
     <div class="resolution">{{ $result.Width }} × {{ $result.Height }}</div>
     <div class="details">
         <span class="img_title clickable">{{ $result.Title }}</span>
         <a href="{{ $result.Source }}" target="_blank" class="img_source">{{ translate "source" }}</a>
     </div>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}