diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx b/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
index 7de54e6bc..509f94e28 100644
--- a/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
+++ b/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
@@ -24,6 +24,7 @@ export function ContainersDatatableContainer({ endpoint, ...props }: Props) {
   };
 
   console.log("ContainersDatatableContainer");
+  console.log(props);
 
   return (
     <EnvironmentProvider environment={endpoint}>
diff --git a/app/edge/__module.js b/app/edge/__module.js
index 363c7fc85..0f4d6de7b 100644
--- a/app/edge/__module.js
+++ b/app/edge/__module.js
@@ -1,8 +1,9 @@
 import angular from 'angular';
 
 import edgeStackModule from './views/edge-stacks';
+import edgeDevicesModule from './devices'
 
-angular.module('portainer.edge', [edgeStackModule]).config(function config($stateRegistryProvider) {
+angular.module('portainer.edge', [edgeStackModule, edgeDevicesModule]).config(function config($stateRegistryProvider) {
   const edge = {
     name: 'edge',
     url: '/edge',
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
index b3739e111..232dae74e 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer.tsx
@@ -1,4 +1,5 @@
 import { react2angular } from '@/react-tools/react2angular';
+
 import { TableSettingsProvider } from 'Portainer/components/datatables/components/useTableSettings';
 import { SearchBarProvider } from 'Portainer/components/datatables/components/SearchBar';
 
diff --git a/app/edge/devices/index.ts b/app/edge/devices/index.ts
index 81c2d8112..66e18e1c7 100644
--- a/app/edge/devices/index.ts
+++ b/app/edge/devices/index.ts
@@ -1,6 +1,7 @@
 import angular from 'angular';
+
 import { EdgeDevicesDatatableAngular } from "@/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableContainer";
 
 export default angular
-  .module('portainer.edge.devices', [])
+    .module('portainer.edge.devices', [])
   .component('edgeDevicesDatatable', EdgeDevicesDatatableAngular).name;
diff --git a/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesView.html b/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesView.html
index a8dac7c51..51a22ed04 100644
--- a/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesView.html
+++ b/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesView.html
@@ -9,10 +9,10 @@
 
 <div class="row">
   <div class="col-sm-12">
-    <edge-device-datatable
-      dataset="($ctrl.edgeDevices)"
-      is-add-action-visible="false"
-      on-refresh="($ctrl.getEndpoints)"
-    ></edge-device-datatable>
+    <edge-devices-datatable
+      dataset="(edgeDevices)"
+      is-add-action-visible="true"
+      on-refresh="(getEnvironments)"
+    ></edge-devices-datatable>
   </div>
 </div>
diff --git a/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesViewController.js b/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesViewController.js
index 557a6638a..65b161eb4 100644
--- a/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesViewController.js
+++ b/app/edge/views/edge-devices/edgeDevicesView/edgeDevicesViewController.js
@@ -2,15 +2,12 @@ angular.module('portainer.edge').controller('EdgeDevicesViewController', EdgeDev
 
 /* @ngInject */
 export function EdgeDevicesViewController($scope, EndpointService, ModalService, Notifications) {
-  $scope.getEnvironments = getEnvironments;
-
   console.log("EdgeDevicesViewController");
-  console.log(EndpointService);
 
+  $scope.getEnvironments = getEnvironments;
   function getEnvironments() {
     EndpointService.endpoints()
         .then(function success(data) {
-          console.log("edgeDevices");
           $scope.edgeDevices = data.value;
           console.log($scope.edgeDevices);
         })