diff --git a/nomad/client_fs_endpoint.go b/nomad/client_fs_endpoint.go
index 998d30389001..120927a545d0 100644
--- a/nomad/client_fs_endpoint.go
+++ b/nomad/client_fs_endpoint.go
@@ -292,6 +292,7 @@ func (f *FileSystem) stream(conn io.ReadWriteCloser) {
 				code = helper.Int64ToPtr(404)
 			}
 			f.handleStreamResultError(err, code, encoder)
+			return
 		}
 
 		// Get a connection to the server