diff --git a/Yep/ViewControllers/Feeds/FeedsViewController.swift b/Yep/ViewControllers/Feeds/FeedsViewController.swift
index 69198aa8..1eda65fb 100644
--- a/Yep/ViewControllers/Feeds/FeedsViewController.swift
+++ b/Yep/ViewControllers/Feeds/FeedsViewController.swift
@@ -15,10 +15,16 @@ class FeedsViewController: UIViewController {
 
     let feedCellID = "FeedCell"
 
+    lazy var noFeedsFooterView: InfoView = InfoView(NSLocalizedString("No Feeds.", comment: ""))
+
     var feeds = [DiscoveredFeed]() {
         didSet {
             dispatch_async(dispatch_get_main_queue()) { [weak self] in
                 self?.feedsTableView.reloadData()
+
+                if let strongSelf = self {
+                    strongSelf.feedsTableView.tableFooterView = strongSelf.feeds.isEmpty ? strongSelf.noFeedsFooterView : UIView()
+                }
             }
         }
     }
@@ -44,6 +50,7 @@ class FeedsViewController: UIViewController {
 
         feedsTableView.backgroundColor = UIColor.whiteColor()
         feedsTableView.registerNib(UINib(nibName: feedCellID, bundle: nil), forCellReuseIdentifier: feedCellID)
+        feedsTableView.tableFooterView = UIView()
 
         discoverFeedsWithSortStyle(.Time, pageIndex: 1, perPage: 100, failureHandler: { reason, errorMessage in
             defaultFailureHandler(reason, errorMessage: errorMessage)
diff --git a/Yep/Views/Cells/Feed/FeedCell.xib b/Yep/Views/Cells/Feed/FeedCell.xib
index c302abcc..703cc799 100644
--- a/Yep/Views/Cells/Feed/FeedCell.xib
+++ b/Yep/Views/Cells/Feed/FeedCell.xib
@@ -90,6 +90,7 @@
                     <constraint firstItem="uir-A9-aaJ" firstAttribute="centerY" secondItem="d97-mK-bJE" secondAttribute="centerY" id="vTi-1C-OoG"/>
                 </constraints>
             </tableViewCellContentView>
+            <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
             <connections>
                 <outlet property="avatarImageView" destination="GRs-kP-Ugk" id="Rch-2A-tIe"/>
                 <outlet property="distanceLabel" destination="uir-A9-aaJ" id="asK-JQ-ew5"/>