diff --git a/lib/WebGUI/Middleware/Debug/Environment.pm b/lib/WebGUI/Middleware/Debug/Environment.pm
new file mode 100644
index 000000000..4849b0d20
--- /dev/null
+++ b/lib/WebGUI/Middleware/Debug/Environment.pm
@@ -0,0 +1,20 @@
+package WebGUI::Middleware::Debug::Environment;
+use 5.008;
+use strict;
+use warnings;
+use parent qw(Plack::Middleware::Debug::Environment);
+our $VERSION = '0.01';
+
+sub run {
+    my ($self, $env, $panel) = @_;
+
+    my $filtered_env = { %$env };
+
+    delete $filtered_env->{'plack.debug.panels'};
+    $filtered_env->{'webgui.session'} &&= 'bless({ ... }, "WebGUI::Session")';
+
+    $self->SUPER::run($filtered_env, $panel);
+}
+
+1;
+
diff --git a/share/site.psgi b/share/site.psgi
index 37df2d42d..6da08f9ca 100644
--- a/share/site.psgi
+++ b/share/site.psgi
@@ -36,7 +36,6 @@ builder {
 
     enable_if { $_[0]->{'webgui.debug'} } 'StackTrace';
     enable_if { $_[0]->{'webgui.debug'} } 'Debug', panels => [
-        'Environment',
         'Timer',
         'Memory',
         'Session',
@@ -46,6 +45,7 @@ builder {
         'Response',
         'Logger',
     ];
+    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Environment';
     enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Performance';
 
     # This one uses the Session object, so it comes after WebGUI::Middleware::Session