diff --git a/go/operation/submit.go b/go/operation/submit.go
index ca151dfb9..8bba14c5f 100644
--- a/go/operation/submit.go
+++ b/go/operation/submit.go
@@ -63,7 +63,7 @@ func SubmitFiles(master string, files []FilePart,
 			results[index].Error = err.Error()
 		}
 		results[index].Fid = file.Fid
-		results[index].FileUrl = file.Server + "/" + file.Fid
+		results[index].FileUrl = ret.PublicUrl + "/" + file.Fid
 	}
 	return results, nil
 }