diff --git a/Gemfile b/Gemfile
index 98640deb4b7..76f6bf40345 100644
--- a/Gemfile
+++ b/Gemfile
@@ -188,7 +188,9 @@ gem 'lru_redux'
 #  If you want to amend mini profiler to do the monkey patches in the railstie
 #  we are open to it. by deferring require to the initializer we can configure disourse installs without it
 
-gem 'rack-mini-profiler', '0.1.30', require: false
+# gem 'rack-mini-profiler', '0.1.30', require: false
+gem 'flamegraph', require: false
+gem 'rack-mini-profiler', require: false
 
 # used for caching, optional
 # redis-rack-cache is missing a sane expiry policy, it hogs redis
diff --git a/Gemfile.lock b/Gemfile.lock
index d5bca75c73f..693cb70d7d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,9 +180,14 @@ GEM
     fast_blank (0.0.1)
       rake
       rake-compiler
+    fast_stack (0.0.3)
+      rake
+      rake-compiler
     fast_xs (0.8.0)
     fastimage (1.3.0)
     ffi (1.8.1)
+    flamegraph (0.0.2)
+      fast_stack
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -474,6 +479,7 @@ DEPENDENCIES
   fast_xor!
   fast_xs
   fastimage
+  flamegraph
   fog
   handlebars-source (= 1.0.12)
   highline
@@ -507,7 +513,7 @@ DEPENDENCIES
   qunit-rails
   rack-cache
   rack-cors
-  rack-mini-profiler (= 0.1.30)
+  rack-mini-profiler
   rails (= 3.2.12)
   rails_multisite!
   rake
diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index b2bdbd1a6b6..a603a92343d 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -216,9 +216,14 @@ GEM
     fast_blank (0.0.1)
       rake
       rake-compiler
+    fast_stack (0.0.3)
+      rake
+      rake-compiler
     fast_xs (0.8.0)
     fastimage (1.5.0)
     ffi (1.9.0)
+    flamegraph (0.0.2)
+      fast_stack
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -484,6 +489,7 @@ DEPENDENCIES
   fast_xor!
   fast_xs
   fastimage
+  flamegraph
   fog
   handlebars-source (= 1.0.12)
   highline
@@ -517,7 +523,7 @@ DEPENDENCIES
   qunit-rails
   rack-cache
   rack-cors
-  rack-mini-profiler (= 0.1.30)
+  rack-mini-profiler
   rails!
   rails-observers
   rails_multisite!
diff --git a/config/initializers/06-mini_profiler.rb b/config/initializers/06-mini_profiler.rb
index 8e24637a5d9..35765a14440 100644
--- a/config/initializers/06-mini_profiler.rb
+++ b/config/initializers/06-mini_profiler.rb
@@ -1,6 +1,7 @@
 # If Mini Profiler is included via gem
 if Rails.configuration.respond_to?(:enable_mini_profiler) && Rails.configuration.enable_mini_profiler
   require 'rack-mini-profiler'
+  require 'flamegraph'
   # initialization is skipped so trigger it
   Rack::MiniProfilerRails.initialize!(Rails.application)
 end