diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
index c52f1756ba8..5eea1595b82 100644
--- a/cmd/ipfs/daemon.go
+++ b/cmd/ipfs/daemon.go
@@ -367,7 +367,7 @@ func serveHTTPApi(req cmds.Request) (error, <-chan error) {
 		corehttp.MetricsCollectionOption("api"),
 		corehttp.CommandsOption(*req.InvocContext()),
 		corehttp.WebUIOption,
-		corehttp.GatewayOption("/ipfs", "/ipns"),
+		corehttp.GatewayOption(corehttp.WebUIPaths...),
 		corehttp.VersionOption(),
 		defaultMux("/debug/vars"),
 		defaultMux("/debug/pprof/"),
diff --git a/test/sharness/t0110-gateway.sh b/test/sharness/t0110-gateway.sh
index 7556ef4d45a..fd218a344a0 100755
--- a/test/sharness/t0110-gateway.sh
+++ b/test/sharness/t0110-gateway.sh
@@ -32,6 +32,10 @@ test_expect_success "GET IPFS path output looks good" '
   rm actual
 '
 
+test_expect_success "GET IPFS path on API unavailable" '
+  test_curl_resp_http_code "http://127.0.0.1:$apiport/ipfs/$HASH" "HTTP/1.1 404 Not Found"
+'
+
 test_expect_success "GET IPFS directory path succeeds" '
   mkdir dir &&
   echo "12345" >dir/test &&