diff --git a/dspace-api/src/main/java/org/dspace/search/DSQuery.java b/dspace-api/src/main/java/org/dspace/search/DSQuery.java
index 11b8ff2e15..1a86122d45 100644
--- a/dspace-api/src/main/java/org/dspace/search/DSQuery.java
+++ b/dspace-api/src/main/java/org/dspace/search/DSQuery.java
@@ -264,7 +264,7 @@ public class DSQuery
 
     static String checkEmptyQuery(String myquery)
     {
-        if (myquery.equals(""))
+        if (myquery == null || myquery.equals("()") || myquery.equals(""))
         {
             myquery = "empty_query_string";
         }
diff --git a/dspace/CHANGES b/dspace/CHANGES
index 4adc911e09..b920a344ef 100644
--- a/dspace/CHANGES
+++ b/dspace/CHANGES
@@ -14,8 +14,8 @@
 (Claudia Juergen)
  - [2041754] Feature Request #1896717 Registration notification missing information about instance
  - Patch for SF bugs 1775059 and 2352146 2 Authentications with LoginPage cause connection exhaust
- - - Fixed hardcoded metadata language qualifier in DescribeStep to use default.language configuration parameter
-
+ - Fixed hardcoded metadata language qualifier in DescribeStep to use default.language configuration parameter
+ - Fix for SF Bug #2343849 DSQuery invalid check for empty query string
 (Elliot Metsger)
  - Patch for SF bug #2016130 checksum checker can not retrieve very large bitstream