diff --git a/lib/services/search_service.dart b/lib/services/search_service.dart
index a564ba7d7..03f22e3c5 100644
--- a/lib/services/search_service.dart
+++ b/lib/services/search_service.dart
@@ -15,7 +15,6 @@ import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/user_service.dart';
 
 class SearchService {
-  List<File> _cachedFiles;
   Future<List<File>> _future;
   final _dio = Network.instance.getDio();
   final _config = Configuration.instance;
@@ -37,19 +36,16 @@ class SearchService {
     });
 
     Bus.instance.on<LocalPhotosUpdatedEvent>().listen((event) {
-      _cachedFiles = null;
+      _future = null;
       getAllFiles();
     });
   }
 
   Future<List<File>> getAllFiles() async {
-    if (_cachedFiles != null) {
-      return _cachedFiles;
-    }
     if (_future != null) {
       return _future;
     }
-    _future = _fetchAllFiles();
+    _future = FilesDB.instance.getAllFilesFromDB();
     return _future;
   }
 
@@ -69,7 +65,7 @@ class SearchService {
   }
 
   void clearCache() {
-    _cachedFiles.clear();
+    _future = null;
   }
 
   Future<List<LocationSearchResult>> getLocationSearchResults(
@@ -160,9 +156,4 @@ class SearchService {
         location.longitude < locationData.bbox[2] &&
         location.latitude < locationData.bbox[3];
   }
-
-  Future<List<File>> _fetchAllFiles() async {
-    _cachedFiles = await FilesDB.instance.getAllFilesFromDB();
-    return _cachedFiles;
-  }
 }