diff --git a/app/views/_tailwind/applications/_map.html.erb b/app/views/_tailwind/applications/_map.html.erb
index 7e736433b..46f02db1b 100644
--- a/app/views/_tailwind/applications/_map.html.erb
+++ b/app/views/_tailwind/applications/_map.html.erb
@@ -1,4 +1,5 @@
 <%# TODO: Use the new library loader for google maps. Might make this a little less ugly %>
+<%# TODO: Show static map and pano when javascript is disabled %>
 <div class="flex justify-between">
   <div x-data
         <%# This handles both when google maps is ready before alpine and the other way around %>
@@ -7,7 +8,9 @@
         class="w-full xl:w-[528px] sm:h-[528px] aspect-1 h-auto">
     <%= tag.div class: "bg-google-maps-green w-full h-full",
                 data: { lat: application.lat, lng: application.lng, address: application.address, zoom: 16 },
-                "x-ref" => "map" %>
+                "x-ref" => "map" do %>
+      <noscript><%= google_static_map(application, size: "528x528") %></noscript>
+    <% end %>
   </div>
   <div x-data
        x-init="if('google' in window) initialisePano($refs.pano)"
@@ -15,7 +18,10 @@
        class="hidden xl:block w-[528px] h-[528px]">
     <%= tag.div class: "w-full h-full",
                 data: { lat: application.lat, lng: application.lng, address: application.address },
-                "x-ref" => "pano" %>
+                "x-ref" => "pano" do %>
+      <%# TODO: The no javascript version of streetview isn't working for some reason %>
+      <noscript><%= google_static_streetview(application, size: "528x528") %></noscript>
+    <% end %>
   </div>
 </div>