diff --git a/plugins/profile_description_block/lib/profile_description_block.rb b/plugins/profile_description_block/lib/profile_description_block.rb
index 70abed1..50f967f 100644
--- a/plugins/profile_description_block/lib/profile_description_block.rb
+++ b/plugins/profile_description_block/lib/profile_description_block.rb
@@ -16,24 +16,6 @@ class ProfileDescriptionBlock < Block
     _('PROFILE DESCRIPTION')
   end
 
-  def content(args={})
-    description =  if self.owner.description.blank?
-                      "Description field is empty or
-                        not enabled on enviroment"
-                   else
-                      self.owner.description
-                   end
-    block = self
-    s = show_name
-    proc do
-      render(
-        :file => 'blocks/profile_description',
-        :locals => { :block => block, :show_name => s ,
-                     :description => description}
-      )
-    end
-  end
-
   def cacheable?
     false
   end
diff --git a/plugins/profile_description_block/test/unit/profile_description_block_test.rb b/plugins/profile_description_block/test/unit/profile_description_block_test.rb
index c642a27..656399b 100644
--- a/plugins/profile_description_block/test/unit/profile_description_block_test.rb
+++ b/plugins/profile_description_block/test/unit/profile_description_block_test.rb
@@ -1,6 +1,16 @@
 require 'test_helper'
 
 class ProfileDescriptionBlockTest < ActiveSupport::TestCase
+  should 'describe itself' do
+    assert_not_equal Block.description, ProfileDescriptionBlock.description
+  end
+end
+
+require 'boxes_helper'
+
+class ProfileDescriptionBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
   def setup
     e = Environment.default
     e.enabled_plugins = ['ProfileDescriptionPlugin']
@@ -10,20 +20,20 @@ class ProfileDescriptionBlockTest < ActiveSupport::TestCase
                                :description => "")
   end
 
-  should 'describe itself' do
-    assert_not_equal Block.description, ProfileDescriptionBlock.description
-  end
-
   should "show profile description inside block" do
     new_block = ProfileDescriptionBlock.create!
+
     @profile.boxes.first.blocks << new_block
-    block_menssage = "Description field is empty"
-    assert (instance_eval(&Block.last.content).include?(block_menssage)),
+
+    block_message = "Description field is empty"
+    assert (render_block_content(Block.last).include?(block_message)),
       "description block doesn't show not found description message"
+
     description = "This is an test"
     @profile.update_attribute("description", description)
     @profile.save!
-    assert (instance_eval(&Block.last.content).include?(description)),
+
+    assert (render_block_content(Block.last).include?(description)),
       "Description block doesn't show profile description"
   end
 end
diff --git a/plugins/profile_description_block/views/blocks/profile_description.html.erb b/plugins/profile_description_block/views/blocks/profile_description.html.erb
index 95f1d65..83e352a 100644
--- a/plugins/profile_description_block/views/blocks/profile_description.html.erb
+++ b/plugins/profile_description_block/views/blocks/profile_description.html.erb
@@ -1,8 +1,13 @@
 <div class = 'profile-description-block'>
-<div class =  "block-title">
-  <%= block.title %>
-</div>
-<div class = "profile-description-block-title">
-   <%= description %>
-</div>
+  <div class =  "block-title">
+    <%= block.title %>
+  </div>
+
+  <div class = "profile-description-block-title">
+    <% if block.owner.description.blank? %>
+      Description field is empty or not enabled on enviroment
+    <% else %>
+     <%= block.owner.description %>
+    <% end %>
+  </div>
 </div>
--
libgit2 0.21.2