diff --git a/layouts/partials/footer/modals/flux-influxdb-versions.html b/layouts/partials/footer/modals/flux-influxdb-versions.html
index 0f7665ce5..cc69dd83a 100644
--- a/layouts/partials/footer/modals/flux-influxdb-versions.html
+++ b/layouts/partials/footer/modals/flux-influxdb-versions.html
@@ -19,7 +19,6 @@
 {{ $sameAsLatest := eq $introduced $fluxLatest }}
 {{ $excludePatternOSS := $.Page.Params.exclude_from.oss | default " " }}
 {{ $excludePatternEnterprise := $.Page.Params.exclude_from.enterprise | default " " }}
-{{ $excludeFromNightly := $.Page.Params.exclude_from.nightly | default false }}
 
 <div class="modal-content" id="flux-influxdb-versions">
   <div class="flex-wrapper">
@@ -46,12 +45,12 @@
         {{ $versionSemVer := split $value "." }}
         {{ $supported := cond (ge (index $versionSemVer 0) (index $introducedSemVer 0)) (cond (ge (index $versionSemVer 1) (index $introducedSemVer 1)) (cond (ge (index $versionSemVer 2) (index $introducedSemVer 2)) true false) false) false }}
         {{ $deprecated := and (isset $.Page.Params "deprecated") (cond (ge (index $versionSemVer 0) (index $deprecatedSemVer 0)) (cond (ge (index $versionSemVer 1) (index $deprecatedSemVer 1)) (cond (ge (index $versionSemVer 2) (index $deprecatedSemVer 2)) true false) false) false) }}
-        {{ $excluded := gt (len (findRE (string $excludePatternOSS) $key)) 0 }}
+        {{ $nightlyExcluded := and (eq $key "nightly") $.Page.Params.exclude_from.nightly }}
+        {{ $excluded := or (gt (len (findRE (string $excludePatternOSS) $key)) 0) $nightlyExcluded }}
         <div class="version-row">
           <div class="version-col"><p>InfluxDB {{ $key }}</p></div>
           <div class="version-col"><p>
-            {{ if adm (eq . "nightly") $excludeFromNightly }}
-            {{ else if $excluded }}
+            {{ if $excluded }}
             {{ else if $deprecated }}<span class="deprecated"></span>      
             {{ else if $supported }}<span class="cf-icon Checkmark_New{{ if $sameAsLatest }} pending{{ end }} supported"></span>
             {{ end }}