diff --git a/solr/core/src/java/org/apache/solr/search/QParser.java b/solr/core/src/java/org/apache/solr/search/QParser.java
index a8b7cf825d8..8b3cabce852 100755
--- a/solr/core/src/java/org/apache/solr/search/QParser.java
+++ b/solr/core/src/java/org/apache/solr/search/QParser.java
@@ -259,7 +259,8 @@ public abstract class QParser {
   }
 
   public Query getHighlightQuery() throws ParseException {
-    return getQuery();
+    Query query = getQuery();
+    return query instanceof WrappedQuery ? ((WrappedQuery)query).getWrappedQuery() : query;
   }
 
   public void addDebugInfo(NamedList<Object> debugInfo) {