diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 2349099c6..0ec455382 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -6025,6 +6025,11 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
 {
     [super encodeWithCoder:aCoder];
 
+    // We do this in order to avoid encoding the _tableDrawView, which
+    // should just automatically be created programmatically as needed.
+    if (_tableDrawView)
+        [_tableDrawView removeFromSuperview];
+
     [aCoder encodeObject:_dataSource forKey:CPTableViewDataSourceKey];
     [aCoder encodeObject:_delegate forKey:CPTableViewDelegateKey];