diff --git a/app/src/main/java/io/plaidapp/ui/HomeActivity.kt b/app/src/main/java/io/plaidapp/ui/HomeActivity.kt
index 38403a53a..a8984e638 100644
--- a/app/src/main/java/io/plaidapp/ui/HomeActivity.kt
+++ b/app/src/main/java/io/plaidapp/ui/HomeActivity.kt
@@ -38,8 +38,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewStub
 import android.view.WindowInsets
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
@@ -118,9 +120,16 @@ class HomeActivity : AppCompatActivity() {
 
     private val noFiltersEmptyText by lazy {
         val view = findViewById<ViewStub>(R.id.stub_no_filters).inflate() as TextView
-        // create the no filters empty text
+        noFiltersEmptyText(R.string.no_filters_selected, view)
+    }
+
+    private val noDataView by lazy {
+        val view = findViewById<ViewStub>(R.id.stub_no_data).inflate() as LinearLayout
+        view.apply { findViewById<Button>(R.id.retryButton).setOnClickListener { viewModel.loadData() } }
+    }
 
-        val emptyText = getText(R.string.no_filters_selected) as SpannedString
+    private fun HomeActivity.noFiltersEmptyText(stringId: Int, view: TextView): TextView {
+        val emptyText = getText(stringId) as SpannedString
         val ssb = SpannableStringBuilder(emptyText)
         val annotations = emptyText.getSpans(0, emptyText.length, Annotation::class.java)
 
@@ -151,11 +160,9 @@ class HomeActivity : AppCompatActivity() {
             }
         }
 
-        with(view) {
+        return with(view) {
             text = ssb
-            setOnClickListener {
-                drawer.openDrawer(GravityCompat.END)
-            }
+            setOnClickListener { drawer.openDrawer(GravityCompat.END) }
             view
         }
     }
@@ -293,6 +300,10 @@ class HomeActivity : AppCompatActivity() {
                     val uiModel = viewModel.feedProgress.value
                     return uiModel?.isLoading ?: false
                 }
+
+                override fun onStopLoading() {
+                    checkEmptyState()
+                }
             }
 
         val shotPreloadSizeProvider = ViewPreloadSizeProvider<Shot>()
@@ -528,22 +539,25 @@ class HomeActivity : AppCompatActivity() {
             // if grid is empty check whether we're loading or if no filters are selected
             if (sourcesRepository.getActiveSourcesCount() > 0 && connectivityChecker != null) {
                 connectivityChecker?.connectedStatus?.value?.let {
-                    loading.visibility = View.VISIBLE
-                    setNoFiltersEmptyTextVisibility(View.GONE)
+                    if (filtersAdapter.getEnabledFilterCount() > 0) {
+                        setEmptyStateVisibility(View.GONE, View.VISIBLE, View.GONE)
+                    } else {
+                        setEmptyStateVisibility(View.VISIBLE, View.GONE, View.GONE)
+                    }
                 }
             } else {
-                loading.visibility = View.GONE
-                setNoFiltersEmptyTextVisibility(View.VISIBLE)
+                setEmptyStateVisibility(View.GONE, View.GONE, View.VISIBLE)
             }
             toolbar.translationZ = 0f
         } else {
-            loading.visibility = View.GONE
-            setNoFiltersEmptyTextVisibility(View.GONE)
+            setEmptyStateVisibility(View.GONE, View.GONE, View.GONE)
         }
     }
 
-    private fun setNoFiltersEmptyTextVisibility(visibility: Int) {
-        noFiltersEmptyText.visibility = visibility
+    private fun setEmptyStateVisibility(progressBar: Int, noData: Int, noFilter: Int) {
+        loading.visibility = progressBar
+        noDataView.visibility = noData
+        noFiltersEmptyText.visibility = noFilter
     }
 
     @Suppress("DEPRECATION")
@@ -641,7 +655,7 @@ class HomeActivity : AppCompatActivity() {
 
         TransitionManager.beginDelayedTransition(drawer)
         noConnection.visibility = View.GONE
-        loading.visibility = View.VISIBLE
+        checkEmptyState()
         viewModel.loadData()
     }
 
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 487d6ae4a..d0fac5298 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -61,6 +61,14 @@
             android:indeterminateTint="?android:colorAccent"
             android:indeterminateTintMode="src_in" />
 
+        <ViewStub
+            android:id="@+id/stub_no_data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="@dimen/spacing_huge"
+            android:layout="@layout/no_data" />
+
         <ViewStub
             android:id="@+id/stub_no_filters"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/no_data.xml b/app/src/main/res/layout/no_data.xml
new file mode 100644
index 000000000..ad8271f87
--- /dev/null
+++ b/app/src/main/res/layout/no_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/noDataContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="1dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="@dimen/padding_normal"
+        android:text="@string/no_data"
+        android:textColor="@color/text_primary_light"
+        android:textSize="15sp"
+        tools:text="@string/no_data" />
+
+    <Button
+        android:id="@+id/retryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:foreground="?attr/selectableItemBackground"
+        android:text="@string/retry"
+        android:textAllCaps="false"
+        android:textSize="15sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2421d4412..269b80d45 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,8 +35,10 @@
     <string name="add">Add</string>
     <string name="edit">Edit</string>
     <string name="no_filters_selected">No filters selected, press the filter button above (<annotation src="@drawable/ic_filter_small">&#2228;</annotation>)\n<i><annotation foregroundColor="@color/text_secondary_light">or swipe from the&#160;right</annotation></i></string>
+    <string name="no_data">Error loading data</string>
 
     <!--searchable label-->
     <string name="search_hint">Search Dribbble &amp; Designer News</string>
+    <string name="retry">Retry</string>
 
 </resources>
diff --git a/core/src/main/java/io/plaidapp/core/ui/filter/FilterAdapter.kt b/core/src/main/java/io/plaidapp/core/ui/filter/FilterAdapter.kt
index 7c2167a6e..000b195bf 100644
--- a/core/src/main/java/io/plaidapp/core/ui/filter/FilterAdapter.kt
+++ b/core/src/main/java/io/plaidapp/core/ui/filter/FilterAdapter.kt
@@ -65,8 +65,8 @@ class FilterAdapter : ListAdapter<SourceUiModel, FilterViewHolder>(sourceUiModel
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FilterViewHolder {
         val holder = FilterViewHolder(
-                LayoutInflater.from(viewGroup.context)
-                        .inflate(R.layout.filter_item, viewGroup, false)
+            LayoutInflater.from(viewGroup.context)
+                .inflate(R.layout.filter_item, viewGroup, false)
         )
         holder.itemView.setOnClickListener {
             val position = holder.adapterPosition
@@ -109,4 +109,12 @@ class FilterAdapter : ListAdapter<SourceUiModel, FilterViewHolder>(sourceUiModel
         val uiModel = getItem(position)
         uiModel.onSourceDismissed(uiModel)
     }
+
+    fun getEnabledFilterCount(): Int {
+        var count = 0
+        currentList.map {
+            if (it.active) count = count.inc()
+        }
+        return count
+    }
 }
diff --git a/core/src/main/java/io/plaidapp/core/ui/recyclerview/InfiniteScrollListener.kt b/core/src/main/java/io/plaidapp/core/ui/recyclerview/InfiniteScrollListener.kt
index 23d60ad72..7777bcc5b 100644
--- a/core/src/main/java/io/plaidapp/core/ui/recyclerview/InfiniteScrollListener.kt
+++ b/core/src/main/java/io/plaidapp/core/ui/recyclerview/InfiniteScrollListener.kt
@@ -37,13 +37,17 @@ abstract class InfiniteScrollListener(
         val totalItemCount = layoutManager.itemCount
         val firstVisibleItem = layoutManager.findFirstVisibleItemPosition()
 
-        if (totalItemCount - visibleItemCount <= firstVisibleItem + VISIBLE_THRESHOLD) {
+        if (totalItemCount - visibleItemCount <= firstVisibleItem + VISIBLE_THRESHOLD && totalItemCount > 0) {
             recyclerView.post(loadMoreRunnable)
+        } else {
+            onStopLoading()
         }
     }
 
     abstract fun onLoadMore()
 
+    abstract fun onStopLoading()
+
     abstract fun isDataLoading(): Boolean
 
     companion object {
diff --git a/designernews/src/main/java/io/plaidapp/designernews/data/api/ClientAuthInterceptor.kt b/designernews/src/main/java/io/plaidapp/designernews/data/api/ClientAuthInterceptor.kt
deleted file mode 100644
index 404665421..000000000
--- a/designernews/src/main/java/io/plaidapp/designernews/data/api/ClientAuthInterceptor.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2019 Google LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.plaidapp.designernews.data.api
-
-import io.plaidapp.core.designernews.data.login.AuthTokenLocalDataSource
-import java.io.IOException
-import okhttp3.Interceptor
-import okhttp3.Response
-
-/**
- * An {@see Interceptor} that adds an auth token to requests if one is provided, otherwise
- * adds a client id.
- */
-class ClientAuthInterceptor(
-    private val authTokenDataSource: AuthTokenLocalDataSource,
-    private val clientId: String
-) : Interceptor {
-    @Throws(IOException::class)
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val requestBuilder = chain.request().newBuilder()
-        if (!authTokenDataSource.authToken.isNullOrEmpty()) {
-            requestBuilder.addHeader("Authorization",
-                    "Bearer ${authTokenDataSource.authToken}")
-        } else {
-            val url = chain.request().url.newBuilder()
-                    .addQueryParameter("client_id", clientId).build()
-            requestBuilder.url(url)
-        }
-        return chain.proceed(requestBuilder.build())
-    }
-}
diff --git a/search/src/main/java/io/plaidapp/search/domain/LoadSearchDataUseCase.kt b/search/src/main/java/io/plaidapp/search/domain/LoadSearchDataUseCase.kt
index 2d1a53ea2..7ae88a746 100644
--- a/search/src/main/java/io/plaidapp/search/domain/LoadSearchDataUseCase.kt
+++ b/search/src/main/java/io/plaidapp/search/domain/LoadSearchDataUseCase.kt
@@ -57,6 +57,7 @@ class LoadSearchDataUseCase(
                 deferredJobs.add(async { it.loadMore() })
             }
         }
+        if (_searchResult.value == null) _searchResult.postValue(emptyList())
         deferredJobs.awaitAll()
     }
 
diff --git a/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt b/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt
index 682722c1c..38dd33e06 100644
--- a/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt
+++ b/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt
@@ -169,6 +169,8 @@ class SearchActivity : AppCompatActivity() {
                 override fun isDataLoading(): Boolean {
                     return viewModel.searchProgress.value?.isLoading ?: false
                 }
+
+                override fun onStopLoading() {}
             })
             setHasFixedSize(true)