diff --git a/app/models/query.rb b/app/models/query.rb
index 19bd1bed5..e49147dea 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -492,25 +492,27 @@ class Query < ActiveRecord::Base
 
   def project_statement
     project_clauses = []
-    if project && !project.descendants.active.empty?
-      ids = [project.id]
-      if has_filter?("subproject_id")
-        case operator_for("subproject_id")
-        when '='
-          # include the selected subprojects
-          ids += values_for("subproject_id").each(&:to_i)
-        when '!*'
-          # main project only
-        else
-          # all subprojects
+    unless project.descendants.blank?
+      if project && !project.descendants.active.empty?
+        ids = [project.id]
+        if has_filter?("subproject_id")
+          case operator_for("subproject_id")
+            when '='
+              # include the selected subprojects
+              ids += values_for("subproject_id").each(&:to_i)
+            when '!*'
+              # main project only
+            else
+              # all subprojects
+              ids += project.descendants.collect(&:id)
+          end
+        elsif Setting.display_subprojects_issues?
           ids += project.descendants.collect(&:id)
         end
-      elsif Setting.display_subprojects_issues?
-        ids += project.descendants.collect(&:id)
+        project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
+      elsif project
+        project_clauses << "#{Project.table_name}.id = %d" % project.id
       end
-      project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
-    elsif project
-      project_clauses << "#{Project.table_name}.id = %d" % project.id
     end
     project_clauses.any? ? project_clauses.join(' AND ') : nil
   end