diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb0cbb27..cdf70a0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Version counting is based on semantic versioning (Major.Feature.Patch)
 
 ### YACReaderLibrary
 * Fix table view last section stretch. Before it was only working randomly.
+* Fix empty table view caused by wront state being saved. You'll need to reconfigure the table view headers to your liking after this.
 
 ## 9.16.2
 
diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp
index ec92c8e6..5eb2720f 100644
--- a/YACReaderLibrary/classic_comics_view.cpp
+++ b/YACReaderLibrary/classic_comics_view.cpp
@@ -353,6 +353,10 @@ void ClassicComicsView::updateTableView(int i)
 
 void ClassicComicsView::saveTableHeadersStatus()
 {
+    if (model == nullptr) {
+        return;
+    }
+
     settings->setValue(COMICS_VIEW_HEADERS, tableView->horizontalHeader()->saveState());
 }
 
diff --git a/common/yacreader_global_gui.h b/common/yacreader_global_gui.h
index cb7397fa..a4e667e4 100644
--- a/common/yacreader_global_gui.h
+++ b/common/yacreader_global_gui.h
@@ -57,7 +57,7 @@
 
 #define MAIN_WINDOW_GEOMETRY "MAIN_WINDOW_GEOMETRY"
 #define MAIN_WINDOW_STATE "MAIN_WINDOW_STATE"
-#define COMICS_VIEW_HEADERS "COMICS_VIEW_HEADERS_NEW" // VALUE CHANGED IN 9.14 to avoid issues with previous versions
+#define COMICS_VIEW_HEADERS "COMICS_VIEW_HEADERS_9.16.3" // VALUE CHANGED IN 9.16.3 to avoid issues with previous versions
 #define COMICS_VIEW_HEADERS_GEOMETRY "COMICS_VIEW_HEADERS_GEOMETRY"
 #define COMICS_VIEW_STATUS "COMICS_VIEW_STATUS"
 #define COMICS_VIEW_FLOW_SPLITTER_STATUS "COMICS_VIEW_FLOW_SPLITTER_STATUS"
diff --git a/custom_widgets/whats_new_dialog.cpp b/custom_widgets/whats_new_dialog.cpp
index 614dceca..966997d7 100644
--- a/custom_widgets/whats_new_dialog.cpp
+++ b/custom_widgets/whats_new_dialog.cpp
@@ -72,6 +72,7 @@ YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent)
                   "   &#8226; Prevent crash when opening the folders context menu if a folder is not selected. (new in 9.16.2)<br/>"
                   "   &#8226; Fix crash when using the `Set type` menu on libraries. (new in 9.16.2)<br/>"
                   "   &#8226; Fix table view last section stretch. Before it was only working randomly. (new in 9.16.3)<br/>"
+                  "   &#8226; Fix empty table view caused by wront state being saved. You'll need to reconfigure the table view headers to your liking after this udpate. (new in 9.16.3)<br/>"
                   "<br/>"
                   "<span style=\"font-weight:600\">YACReaderLibraryServer</span><br/>"
                   "   &#8226; Log libraries validation when the app starts<br/>"