diff --git a/lib/Server.js b/lib/Server.js
index 1c7f3c96bd..d1826f5daa 100644
--- a/lib/Server.js
+++ b/lib/Server.js
@@ -251,24 +251,22 @@ class Server {
   setupHistoryApiFallbackFeature() {
     const historyApiFallback = require('connect-history-api-fallback');
 
-    const fallback =
-      typeof this.options.historyApiFallback === 'object'
+    const options =
+      typeof this.options.historyApiFallback !== 'undefined'
         ? this.options.historyApiFallback
-        : null;
+        : {};
 
     let logger;
-    if (fallback) {
-      // respect when user supplies their own logger
-      if (fallback.logger) {
-        logger = fallback.logger;
-      } else if (fallback.verbose) {
-        // enable logs using own logger when verbose is supplied
-        logger = this.logger.log;
-      }
+
+    if (typeof options.verbose === 'undefined') {
+      logger = this.logger.log.bind(
+        this.logger,
+        '[connect-history-api-fallback]'
+      );
     }
 
     // Fall back to /index.html if nothing else matches.
-    this.app.use(historyApiFallback({ ...fallback, logger }));
+    this.app.use(historyApiFallback({ logger, ...options }));
   }
 
   setupStaticFeature() {