diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go
index 2aa196396..af1269b93 100644
--- a/swarm/api/http/server.go
+++ b/swarm/api/http/server.go
@@ -129,7 +129,7 @@ func NewServer(api *api.API, corsString string) *Server {
 	})
 	mux.Handle("/bzz-immutable:/", methodHandler{
 		"GET": Adapt(
-			http.HandlerFunc(server.HandleGet),
+			http.HandlerFunc(server.HandleBzzGet),
 			defaultMiddlewares...,
 		),
 	})
diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go
index 2b6a97ebd..efefa9fae 100644
--- a/swarm/api/http/server_test.go
+++ b/swarm/api/http/server_test.go
@@ -672,7 +672,7 @@ func testBzzGetPath(encrypted bool, t *testing.T) {
 
 	nonhashresponses := []string{
 		`cannot resolve name: no DNS to resolve name: "name"`,
-		`cannot resolve nonhash: immutable address not a content hash: "nonhash"`,
+		`cannot resolve nonhash: no DNS to resolve name: "nonhash"`,
 		`cannot resolve nonhash: no DNS to resolve name: "nonhash"`,
 		`cannot resolve nonhash: no DNS to resolve name: "nonhash"`,
 		`cannot resolve nonhash: no DNS to resolve name: "nonhash"`,