diff --git a/WorkManagerSample/app/src/main/java/com/example/background/FilterActivity.kt b/WorkManagerSample/app/src/main/java/com/example/background/FilterActivity.kt
index 15c616a3..4060aa8d 100644
--- a/WorkManagerSample/app/src/main/java/com/example/background/FilterActivity.kt
+++ b/WorkManagerSample/app/src/main/java/com/example/background/FilterActivity.kt
@@ -41,8 +41,7 @@ class FilterActivity : AppCompatActivity() {
             bindViews(this)
             // Check to see if we have output.
             viewModel.workInfo.observe(this@FilterActivity) { info ->
-                if (info != null)
-                    onStateChange(info, this)
+                if (info.size == 0) return@observe else onStateChange(info[0], this)
             }
         }
     }
diff --git a/WorkManagerSample/app/src/main/java/com/example/background/FilterViewModel.kt b/WorkManagerSample/app/src/main/java/com/example/background/FilterViewModel.kt
index b2dffbc7..992220ec 100644
--- a/WorkManagerSample/app/src/main/java/com/example/background/FilterViewModel.kt
+++ b/WorkManagerSample/app/src/main/java/com/example/background/FilterViewModel.kt
@@ -33,9 +33,7 @@ class FilterViewModel(application: Application) : ViewModel() {
     private val workManager = WorkManager.getInstance(application)
 
     internal val workInfo =
-        workManager.getWorkInfosByTagLiveData(Constants.TAG_OUTPUT).map {
-            it.firstOrNull()
-        }
+        workManager.getWorkInfosByTagLiveData(Constants.TAG_OUTPUT)
 
     internal fun apply(imageOperations: ImageOperations) {
         imageOperations.continuation.enqueue()
diff --git a/WorkManagerSample/lib/src/androidTest/java/com/example/background/workers/filters/BaseFilterWorkerTest.kt b/WorkManagerSample/lib/src/androidTest/java/com/example/background/workers/filters/BaseFilterWorkerTest.kt
index 34869a2f..b962ff51 100644
--- a/WorkManagerSample/lib/src/androidTest/java/com/example/background/workers/filters/BaseFilterWorkerTest.kt
+++ b/WorkManagerSample/lib/src/androidTest/java/com/example/background/workers/filters/BaseFilterWorkerTest.kt
@@ -41,6 +41,7 @@ class BaseFilterWorkerTest {
 
     private lateinit var worker: TestBaseFilterWorker
     private val context: Context = ApplicationProvider.getApplicationContext()
+
     private lateinit var executor: ExecutorService
 
     @Before