diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt
index 6dd93ceb6..5c3d7b56e 100644
--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt
+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt
@@ -103,10 +103,12 @@ class SearchViewModel @Inject constructor(
      * search query in the search text field, defining this method.
      */
     fun onSearchTriggered(query: String) {
-        viewModelScope.launch {
-            recentSearchRepository.insertOrReplaceRecentSearch(searchQuery = query)
+        if (query.isNotBlank()) {
+            viewModelScope.launch {
+                recentSearchRepository.insertOrReplaceRecentSearch(searchQuery = query)
+            }
+            analyticsHelper.logEventSearchTriggered(query = query)
         }
-        analyticsHelper.logEventSearchTriggered(query = query)
     }
 
     fun clearRecentSearches() {