diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 5797df77..3bbeaef3 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -435,7 +435,7 @@ module Jekyll
     private
     def configure_include_paths
       @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-      @includes_load_paths << theme.includes_path if self.theme
+      @includes_load_paths << theme.includes_path if self.theme && theme.includes_path
     end
 
     private