diff --git a/openpype/tools/publisher/publish_report_viewer/widgets.py b/openpype/tools/publisher/publish_report_viewer/widgets.py
index ff388fb277..0d35ac3512 100644
--- a/openpype/tools/publisher/publish_report_viewer/widgets.py
+++ b/openpype/tools/publisher/publish_report_viewer/widgets.py
@@ -27,6 +27,9 @@ class PluginLoadReportModel(QtGui.QStandardItemModel):
         parent = self.invisibleRootItem()
         parent.removeRows(0, parent.rowCount())
 
+        if report is None:
+            return
+
         new_items = []
         new_items_by_filepath = {}
         for filepath in report.crashed_plugin_paths.keys():
diff --git a/openpype/tools/publisher/publish_report_viewer/window.py b/openpype/tools/publisher/publish_report_viewer/window.py
index 2c249d058c..646ae69e7f 100644
--- a/openpype/tools/publisher/publish_report_viewer/window.py
+++ b/openpype/tools/publisher/publish_report_viewer/window.py
@@ -367,6 +367,7 @@ class LoadedFilesView(QtWidgets.QTreeView):
     def _on_rows_inserted(self):
         header = self.header()
         header.resizeSections(header.ResizeToContents)
+        self._update_remove_btn()
 
     def resizeEvent(self, event):
         super(LoadedFilesView, self).resizeEvent(event)