diff --git a/commands/server.go b/commands/server.go
index ad432037c..4669cf0b4 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -288,7 +288,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 					}
 					var fs afero.Fs
 					f.c.withConf(func(conf *commonConfig) {
-						fs = conf.fs.PublishDir
+						fs = conf.fs.PublishDirServer
 					})
 
 					fi, err := fs.Stat(path)
diff --git a/testscripts/commands/server_render_static_to_disk.txt b/testscripts/commands/server_render_static_to_disk.txt
index f2f10e78f..b0e76e318 100644
--- a/testscripts/commands/server_render_static_to_disk.txt
+++ b/testscripts/commands/server_render_static_to_disk.txt
@@ -6,6 +6,7 @@ hugo server --renderStaticToDisk &
 waitServer
 
 httpget $HUGOTEST_BASEURL_0 'Title: Hugo Server Test' $HUGOTEST_BASEURL_0
+httpget ${HUGOTEST_BASEURL_0}mystatic.txt 'This is a static file.'
 
 ! exists public/index.html
 exists public/mystatic.txt