diff --git a/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib b/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib
index 525c4a6a3..bf6fa2d5c 100644
--- a/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib
+++ b/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib
@@ -5,7 +5,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="TimelineTableViewController" customModule="NetNewsWire" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="TimelineViewController" customModule="NetNewsWire" customModuleProvider="target">
             <connections>
                 <outlet property="tableView" destination="opA-RM-DKR" id="Hnf-mE-gcq"/>
                 <outlet property="view" destination="dbt-sN-FU2" id="96u-gC-hW0"/>
diff --git a/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift b/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift
index 8935d2c3d..f555c392b 100644
--- a/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift
+++ b/NetNewsWire/MainWindow/Timeline/TimelineViewController.swift
@@ -21,7 +21,12 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner {
 
 	var state: TimelineState = .empty {
 		didSet {
-			// TODO
+			switch state {
+			case .empty:
+				representedObjects = nil
+			case .representedObjects(let updatedRepresentedObjects):
+				representedObjects = updatedRepresentedObjects
+			}
 		}
 	}
 
@@ -142,7 +147,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner {
 
 		if !didRegisterForNotifications {
 
-			NotificationCenter.default.addObserver(self, selector: #selector(sidebarSelectionDidChange(_:)), name: .SidebarSelectionDidChange, object: nil)
+//			NotificationCenter.default.addObserver(self, selector: #selector(sidebarSelectionDidChange(_:)), name: .SidebarSelectionDidChange, object: nil)
 			NotificationCenter.default.addObserver(self, selector: #selector(statusesDidChange(_:)), name: .StatusesDidChange, object: nil)
 			NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
 			NotificationCenter.default.addObserver(self, selector: #selector(avatarDidBecomeAvailable(_:)), name: .AvatarDidBecomeAvailable, object: nil)
@@ -367,22 +372,22 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner {
 
 	// MARK: - Notifications
 
-	@objc func sidebarSelectionDidChange(_ notification: Notification) {
-
-		guard let userInfo = notification.userInfo else {
-			return
-		}
-		guard let sidebarView = userInfo[UserInfoKey.view] as? NSView, sidebarView.window === tableView.window else {
-			return
-		}
-
-		if let objects = userInfo[UserInfoKey.objects] as? [AnyObject] {
-			representedObjects = objects
-		}
-		else {
-			representedObjects = nil
-		}
-	}
+//	@objc func sidebarSelectionDidChange(_ notification: Notification) {
+//
+//		guard let userInfo = notification.userInfo else {
+//			return
+//		}
+//		guard let sidebarView = userInfo[UserInfoKey.view] as? NSView, sidebarView.window === tableView.window else {
+//			return
+//		}
+//
+//		if let objects = userInfo[UserInfoKey.objects] as? [AnyObject] {
+//			representedObjects = objects
+//		}
+//		else {
+//			representedObjects = nil
+//		}
+//	}
 	
 	@objc func statusesDidChange(_ note: Notification) {