diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e7331f932b4..3a261a495fc 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1122,7 +1122,7 @@ def view_to_hash(view, fetch_data = false)
         item = listicon_item(view, row['id'])
         icon, icon2, image, picture = listicon_glyphicon(item)
         image = "100/#{(@listicon || view.db).underscore}.png" if icon.nil? && image.nil? # TODO: we want to get rid of this
-        icon = nil if %w(pxe).include? params[:controller]
+        icon = nil if %w(pxe middleware_server).include?(params[:controller]) # TODO: adding exceptions here is a wrong approach
         new_row[:cells] << {:title => _('View this item'),
                             :image   => ActionController::Base.helpers.image_path(image.to_s),
                             :picture => ActionController::Base.helpers.image_path(picture.to_s),
diff --git a/spec/controllers/middleware_server_controller_spec.rb b/spec/controllers/middleware_server_controller_spec.rb
index bb68f75a158..e5d8d9e68b1 100644
--- a/spec/controllers/middleware_server_controller_spec.rb
+++ b/spec/controllers/middleware_server_controller_spec.rb
@@ -233,4 +233,22 @@ def timeline_event_expectations(event, operation_info, mw_server)
       end
     end
   end
+
+  describe '#report_data' do
+    context 'list of middleware servers' do
+      let!(:server) { FactoryGirl.create(:middleware_server) }
+
+      subject { assert_report_data_response }
+
+      it 'returns a single middleware server that has an image but not an icon' do
+        report_data_request(:model => 'MiddlewareServer')
+
+        expect(subject["data"]["rows"].length).to eq(1)
+        expect(subject["data"]["rows"][0]["cells"][2]["text"]).to eq(server.name)
+
+        expect(subject["data"]["rows"][0]["cells"][1]["icon"]).to be_nil
+        expect(subject["data"]["rows"][0]["cells"][1]["image"]).not_to be_nil
+      end
+    end
+  end
 end