diff --git a/changelog/unreleased/SOLR-18319-404-simplify.yml b/changelog/unreleased/SOLR-18319-404-simplify.yml
new file mode 100644
index 000000000000..a705474cbf6e
--- /dev/null
+++ b/changelog/unreleased/SOLR-18319-404-simplify.yml
@@ -0,0 +1,8 @@
+title: >
+  Solr's 404 page is less generic.  We now log 404s in Solr's log.
+type: changed
+authors:
+  - name: David Smiley
+links:
+  - name: SOLR-18319
+    url: https://issues.apache.org/jira/browse/SOLR-18319
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index de25af4a9e9c..3d80367921f4 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -318,9 +318,8 @@ protected void init() throws Exception {
       }
     }
 
-    String msg = "no handler, collection, or core for " + path;
-    sendError(404, msg);
-    log.info(msg); // not "error" since Solr isn't necessarily at fault
+    sendError(404, "no handler, collection, or core for " + path);
+    log.info("path={} status=404", path); // not "error" since Solr isn't necessarily at fault
     action = RETURN;
   }
 
diff --git a/solr/webapp/web/WEB-INF/web.xml b/solr/webapp/web/WEB-INF/web.xml
index 04f949e2f6b0..136cb6d4bd40 100644
--- a/solr/webapp/web/WEB-INF/web.xml
+++ b/solr/webapp/web/WEB-INF/web.xml
@@ -167,9 +167,4 @@
     <url-pattern>/zookeeper</url-pattern>
   </servlet-mapping>
 -->
-
-  <error-page>
-    <error-code>404</error-code>
-    <location>/error404.html</location>
-  </error-page>
 </web-app>
diff --git a/solr/webapp/web/error404.html b/solr/webapp/web/error404.html
deleted file mode 100644
index 3d15bd697608..000000000000
--- a/solr/webapp/web/error404.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<p>
-  Searching for Solr?<br/>
-  You must type the correct path.<br/>
-  Solr will respond.
-</p>