diff --git a/core/corehttp/gateway.go b/core/corehttp/gateway.go
index 52560750a..de909a0ef 100644
--- a/core/corehttp/gateway.go
+++ b/core/corehttp/gateway.go
@@ -2,6 +2,7 @@ package corehttp
 
 import (
 	"fmt"
+	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 	"net"
 	"net/http"
 
@@ -25,7 +26,7 @@ func GatewayOption(writable bool, paths ...string) ServeOption {
 			return nil, err
 		}
 
-		api, err := coreapi.NewCoreAPI(n)
+		api, err := coreapi.NewCoreAPI(n, options.Api.Offline(cfg.Gateway.NoFetch))
 		if err != nil {
 			return nil, err
 		}