diff --git a/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee
index da67840752..04c8e8c0b9 100644
--- a/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee
@@ -1,12 +1,10 @@
-Darkswarm.controller "GroupPageCtrl", ($scope, group_enterprises, Enterprises, MapConfiguration, OfnMap, visibleFilter, Navigation) ->
+Darkswarm.controller "GroupPageCtrl", ($scope, enterprises, Enterprises, MapConfiguration, OfnMap, visibleFilter, Navigation) ->
   $scope.Enterprises = Enterprises
 
-  all_enterprises_by_id = Enterprises.enterprises_by_id
+  enterprises_by_id = enterprises.map (enterprise) =>
+    Enterprises.enterprises_by_id[enterprise.id]
 
-  dereferenced_enterprises = group_enterprises.map (enterprise) =>
-    all_enterprises_by_id[enterprise.id]
-
-  visible_enterprises = visibleFilter dereferenced_enterprises
+  visible_enterprises = visibleFilter enterprises_by_id
 
   # TODO: this is duplicate code with app/assets/javascripts/darkswarm/services/enterprises.js.coffee
   # It would be better to load only the needed enterprises (group + related shops).
diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb
index 921648544c..e8f1c18687 100644
--- a/app/helpers/injection_helper.rb
+++ b/app/helpers/injection_helper.rb
@@ -37,7 +37,12 @@ module InjectionHelper
   end
 
   def inject_group_enterprises
-    inject_json_ams "group_enterprises", @group.enterprises.activated.all, Api::EnterpriseSerializer, enterprise_injection_data
+    inject_json_ams(
+      "enterprises",
+      @group.enterprises.activated.all,
+      Api::EnterpriseSerializer,
+      enterprise_injection_data
+    )
   end
 
   def inject_current_hub
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index c0179e50f0..2808d7544e 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -5,12 +5,6 @@
 - content_for(:image) do
   = @group.logo.url
 
--# inject all enterprises as "enterprises"
--# it could be more efficient to inject only the enterprises that are related to the group
-= inject_enterprises
-
--# inject enterprises in this group
--# further hubs and producers of these enterprises can't be resolved within this small subset
 = inject_group_enterprises
 
 #group-page.row.pad-top.footer-pad{"ng-controller" => "GroupPageCtrl"}