diff --git a/src/sentry/static/sentry/app/utils/profiler.jsx b/src/sentry/static/sentry/app/utils/profiler.jsx
index 9b344bbdbcaf3b..8dc1af0b096bd4 100644
--- a/src/sentry/static/sentry/app/utils/profiler.jsx
+++ b/src/sentry/static/sentry/app/utils/profiler.jsx
@@ -27,7 +27,7 @@ export default function profiler() {
           description: `<${displayName}>`,
         },
         {
-          autoPopAfter: 500, // After this timeout we'll pop this activity regardless
+          autoPopAfter: 2000, // After this timeout we'll pop this activity regardless
         }
       );
       // For whatever reason it's not guaranteed that `finishProfile` will be called, that's why we need
diff --git a/src/sentry/templates/sentry/layout.html b/src/sentry/templates/sentry/layout.html
index 26f3372dd2efe3..538a17c235ad04 100644
--- a/src/sentry/templates/sentry/layout.html
+++ b/src/sentry/templates/sentry/layout.html
@@ -38,7 +38,7 @@
   {% block scripts %}
   {% locale_js_include %}
   <script src="{% asset_url "sentry" "dist/vendor.js" %}"{% crossorigin %}></script>
-  <script src="{% asset_url "sentry" "dist/app.js" %}"{% crossorigin %}></script>
+  <script src="{% asset_url "sentry" "dist/app.js" %}"{% crossorigin %} data-entry="true"></script>
 
   <script>
     // if the ads.js file loads below it will mark this variable as false