diff --git a/res/app/components/stf/logcat-table/logcat-table-directive.js b/res/app/components/stf/logcat-table/logcat-table-directive.js
index 734f7f07..a3eb2102 100644
--- a/res/app/components/stf/logcat-table/logcat-table-directive.js
+++ b/res/app/components/stf/logcat-table/logcat-table-directive.js
@@ -19,8 +19,9 @@ module.exports = function logcatTableDirective($rootScope, $timeout, LogcatServi
 
       LogcatService.addFilteredEntriesListener = function (entries) {
         clearTable()
-        var fragment = document.createDocumentFragment()
+        //var fragment = document.createDocumentFragment()
         _.each(entries, function (entry) {
+          // TODO: This is not adding all the entries after first scope creation
           addRow(body, entry, true)
         })
       }
@@ -77,6 +78,8 @@ module.exports = function logcatTableDirective($rootScope, $timeout, LogcatServi
         if (autoScroll && shouldAutoScroll() && !batchRequest) {
           _.throttle(scrollToBottom, 30)()
         }
+
+        console.log(data.message)
       }
 
       function clearTable() {
diff --git a/res/app/components/stf/logcat/logcat-service.js b/res/app/components/stf/logcat/logcat-service.js
index cccd572e..540a075f 100644
--- a/res/app/components/stf/logcat/logcat-service.js
+++ b/res/app/components/stf/logcat/logcat-service.js
@@ -111,7 +111,9 @@ module.exports = function LogcatServiceFactory(socket, DeviceService, FilterStri
     service.filters.entries = _.filter(service.entries, filterLine)
 
     if (typeof(service.addFilteredEntriesListener) === 'function') {
-      service.addFilteredEntriesListener(service.filters.entries)
+      if (!_.isEmpty(service.filters.entries)) {
+        service.addFilteredEntriesListener(service.filters.entries)
+      }
     }
   }
 
diff --git a/res/app/control-panes/logs/logs-controller.js b/res/app/control-panes/logs/logs-controller.js
index 0fcb86ad..a316f79f 100644
--- a/res/app/control-panes/logs/logs-controller.js
+++ b/res/app/control-panes/logs/logs-controller.js
@@ -1,13 +1,13 @@
 module.exports = function LogsCtrl($scope, LogcatService) {
 
-  $scope.logEntries = LogcatService.entries
-
   $scope.started = LogcatService.started
 
   $scope.filters = {}
 
   $scope.filters.levelNumbers = LogcatService.filters.levelNumbers
 
+  LogcatService.filters.filterLines()
+
   $scope.$watch('started', function (newValue, oldValue) {
     if (newValue !== oldValue) {
       LogcatService.started = newValue