diff --git a/webui/src/main/java/com/muwire/webui/SearchServlet.java b/webui/src/main/java/com/muwire/webui/SearchServlet.java
index e9accdb0..50a8e31f 100644
--- a/webui/src/main/java/com/muwire/webui/SearchServlet.java
+++ b/webui/src/main/java/com/muwire/webui/SearchServlet.java
@@ -149,7 +149,7 @@ public class SearchServlet extends HttpServlet {
             }
             
             SearchResults searchResults = searchManager.getResults().get(uuid);
-            Set<UIResultEvent> results = searchResults.getBySender().get(sender);
+            Set<UIResultEvent> results = searchResults.getBySender().getOrDefault(sender, Collections.emptySet());
             List<ResultFromSender> resultsFromSender = new ArrayList<>();
             results.forEach(result -> {
                 ResultStatus resultStatus = ResultStatus.AVAILABLE;
@@ -234,7 +234,7 @@ public class SearchServlet extends HttpServlet {
             
             Set<UIResultEvent> resultSet = searchResults.getByInfoHash(infoHash);
             if (resultSet == null) 
-                return;
+                resultSet = Collections.emptySet();
             
             List<SenderForResult> sendersForResult = new ArrayList<>();
             resultSet.forEach(event -> {
diff --git a/webui/src/main/js/search.js b/webui/src/main/js/search.js
index fd283f43..72482ccc 100644
--- a/webui/src/main/js/search.js
+++ b/webui/src/main/js/search.js
@@ -787,6 +787,8 @@ function refreshSender(searchUUID) {
 			var topTableDiv = document.getElementById("topTableSender")
 			topTableDiv.innerHTML = tableHtml
 			
+			var bottomTableDiv = document.getElementById("bottomTableSender")
+			bottomTableDiv.innerText = ""
 			if (currentSender != null)
 				refreshResultsFromSender(currentSender)
 		}
@@ -809,6 +811,8 @@ function refreshFile(searchUUID) {
 			var topTableDiv = document.getElementById("topTableFile")
 			topTableDiv.innerHTML = tableHtml
 			
+			var bottomTableDiv = document.getElementById("bottomTableFile")
+			bottomTableDiv.innerText = ""
 			if (currentResult != null)
 				refreshSendersForResult(currentResult)
 		}