diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d3aa6a1..dfaae82 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,19 +7,19 @@
 {{ end }}
 
 {{ define "styles" }}
-  {{- if .Page.Scratch.Get "includes_railroad_diagram" -}}
+  {{- if .HasShortcode "figures/railroad" -}}
     <link rel="preload stylesheet" as="style" href="{{ `styles/railroad.css` | absURL }}">
   {{- end -}}
   <link rel="preload stylesheet" as="style" href="{{ `styles/monokai.css` | absURL }}">
 {{ end }}
 
 {{ define "scripts" }}
-  {{- if .Page.Store.Get "includes_railroad_diagram" -}}
+  {{- if .HasShortcode "figures/railroad" -}}
     <script defer type="module" src="{{ `scripts/railroad.js` | absURL }}"></script>
     <script defer type="module" src="{{ `scripts/railroad-utils.js` | absURL }}"></script>
   {{- end -}}
 
-  {{- if .Page.Store.Get "includes_p5_sketch" -}}
+  {{- if .HasShortcode "figures/p5" -}}
     <script defer src="{{ `scripts/p5-1.4.1.min.js` | absURL }}"></script>
     <script defer src="{{ `scripts/sketch-utils.js` | absURL }}"></script>
   {{- end -}}
diff --git a/layouts/shortcodes/figures/p5.html b/layouts/shortcodes/figures/p5.html
index 1cd1c08..bef42b9 100644
--- a/layouts/shortcodes/figures/p5.html
+++ b/layouts/shortcodes/figures/p5.html
@@ -1,5 +1,4 @@
-{{ $id := .Get "id" }}
-{{ .Page.Store.Set "includes_p5_sketch" true }}
+{{- $id := .Get "id" -}}
 <div class="centered">
     <figure class="p5-sketch {{ with .Get "bordered" }}bordered{{ end }}" id="{{ $id }}"></figure>
 </div>
diff --git a/layouts/shortcodes/figures/railroad.html b/layouts/shortcodes/figures/railroad.html
index a20d813..617ba83 100644
--- a/layouts/shortcodes/figures/railroad.html
+++ b/layouts/shortcodes/figures/railroad.html
@@ -1,4 +1,3 @@
 {{- $id := .Get "id" -}}
-{{- .Page.Store.Set "includes_railroad_diagram" true -}}
 <figure class="railroad-diagram" {{ if $id }}id="{{ $id }}"{{ end }}></figure>
 {{ .Inner }}