diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java
index 0534d3b47..5f8584772 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java
@@ -124,8 +124,10 @@ public class HistoryRESTService {
         ConnectionRecordSet history = userContext.getConnectionHistory();
 
         // Restrict to records which contain the specified strings
-        for (String required : requiredContents)
-            history = history.contains(required);
+        for (String required : requiredContents) {
+            if (!required.isEmpty())
+                history = history.contains(required);
+        }
 
         // Sort according to specified ordering
         for (APIConnectionRecordSortPredicate predicate : sortPredicates)