diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 3689b246d..3601f1cdb 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1894,7 +1894,9 @@ Executes what is necessary to make the view() method work with content chunking.
 
 sub prepareView {
 	my $self = shift;
-	$self->{_toolbar} = $self->getToolbar;
+    if ($self->session->var->isAdminOn) {
+        $self->{_toolbar} = $self->getToolbar;
+    }
     my $style = $self->session->style;
     my @keywords = @{WebGUI::Keyword->new($self->session)->getKeywordsForAsset({asset=>$self, asArrayRef=>1})};
     if (scalar @keywords) {