diff --git a/r2/r2/lib/js.py b/r2/r2/lib/js.py
index 2d5119a78..e42d78c87 100644
--- a/r2/r2/lib/js.py
+++ b/r2/r2/lib/js.py
@@ -598,6 +598,13 @@ module["reddit-init"] = LocalizedModule("reddit-init.js",
     wrap=catch_errors,
 )
 
+module["expando-nsfw-flow"] = Module("expando-nsfw-flow.js",
+    TemplateFileSource('ui/formbar.html'),
+    "ui/formbar.js",
+    TemplateFileSource('expando/nsfwgate.html'),
+    "expando/nsfwflow.js",
+)
+
 module["reddit"] = LocalizedModule("reddit.js",
     "lib/jquery.url.js",
     "lib/backbone-1.0.0.js",
@@ -633,10 +640,7 @@ module["reddit"] = LocalizedModule("reddit.js",
     "embed.js",
     "post-sharing.js",
     "expando.js",
-    TemplateFileSource('ui/formbar.html'),
-    "ui/formbar.js",
-    TemplateFileSource('expando/nsfwgate.html'),
-    "expando/nsfwflow.js",
+    # inline expando-nsfw-flow.js module here when unflagged
     "saved.js",
     "cache-poisoning-detection.js",
     "messages.js",
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 44bf2d8d7..247a42969 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -290,6 +290,8 @@ class Reddit(Templated):
 
         if feature.is_enabled("new_expando_icons"):
             self.feature_new_expando_icons = True
+        if feature.is_enabled("expando_nsfw_flow"):
+            self.feature_expando_nsfw_flow = True
 
         # generate a canonical link for google
         canonical_url = UrlParser(canonical_link or request.url)
diff --git a/r2/r2/templates/reddit.html b/r2/r2/templates/reddit.html
index e89364255..00714e3e0 100644
--- a/r2/r2/templates/reddit.html
+++ b/r2/r2/templates/reddit.html
@@ -127,6 +127,9 @@
 <%def name="javascript_bottom()">
   <% from r2.lib import js %>
   ${unsafe(js.use('reddit'))}
+  %if getattr(thing, "feature_expando_nsfw_flow", False):
+    ${unsafe(js.use("expando-nsfw-flow"))}
+  %endif
   ${unsafe(c.js_preload.use())}
 </%def>