diff --git a/web/gui/src/main/webapp/app/view/device/device.js b/web/gui/src/main/webapp/app/view/device/device.js
index 54361ee..f979abf 100644
--- a/web/gui/src/main/webapp/app/view/device/device.js
+++ b/web/gui/src/main/webapp/app/view/device/device.js
@@ -22,7 +22,9 @@
     'use strict';
 
     angular.module('ovDevice', [])
-        .controller('OvDeviceCtrl', ['$log', '$scope', '$location', 'RestService',
+    .controller('OvDeviceCtrl',
+        ['$log', '$scope', '$location', 'RestService',
+
         function ($log, $scope, $location, rs) {
             var self = this;
             self.deviceData = [];
@@ -38,6 +40,11 @@
             };
             $scope.sortCallback();
 
+            // Cleanup on destroyed scope
+            $scope.$on('$destroy', function () {
+
+            });
+
             $log.log('OvDeviceCtrl has been created');
         }]);
 }());