diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62474854b..5679ff6d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
## 2.8.3 (unreleased)
+- Added experimental support for Propshaft
- Fixed error with walsender queries on live queries page
## 2.8.2 (2021-12-15)
diff --git a/app/views/layouts/pg_hero/application.html.erb b/app/views/layouts/pg_hero/application.html.erb
index 4cf6ddd72..419610554 100644
--- a/app/views/layouts/pg_hero/application.html.erb
+++ b/app/views/layouts/pg_hero/application.html.erb
@@ -5,8 +5,13 @@
<%= favicon_link_tag "pghero/favicon.png" %>
- <%= stylesheet_link_tag "pghero/application" %>
- <%= javascript_include_tag "pghero/application" %>
+ <% if defined?(Propshaft::Railtie) %>
+ <%= stylesheet_link_tag "pghero/nouislider", "pghero/arduino-light", "pghero/application" %>
+ <%= javascript_include_tag "pghero/jquery", "pghero/nouislider", "pghero/Chart.bundle", "pghero/chartkick", "pghero/highlight.pack", "pghero/application" %>
+ <% else %>
+ <%= stylesheet_link_tag "pghero/application" %>
+ <%= javascript_include_tag "pghero/application" %>
+ <% end %>