diff --git a/apps/rhino-compute-server/Endpoints/GrasshopperEndpoints.cs b/apps/rhino-compute-server/Endpoints/GrasshopperEndpoints.cs
index ecd0d1f30..2d3f2ffdd 100644
--- a/apps/rhino-compute-server/Endpoints/GrasshopperEndpoints.cs
+++ b/apps/rhino-compute-server/Endpoints/GrasshopperEndpoints.cs
@@ -28,6 +28,9 @@ public GrasshopperEndpointsModule(IRouteCacheProvider routeCacheProvider)
 
     public class NodePenSolutionRequestBody
     {
+      [JsonProperty("streamId")]
+      public string StreamId { get; set; }
+
       [JsonProperty("solutionId")]
       public string SolutionId { get; set; }
 
@@ -155,8 +158,8 @@ public Response SolveGrasshopperDocument(NancyContext context)
       }
 
       // Commit updated document and solution data to stream
-      string streamId = Environment.SpeckleStreamId;
-      string branchName = "main";
+      string streamId = requestData.StreamId;
+      string branchName = "np-model";
 
       Account account = new Account()
       {
diff --git a/apps/rhino-compute-server/Program.cs b/apps/rhino-compute-server/Program.cs
index a0a36cd74..0ee0c93cb 100644
--- a/apps/rhino-compute-server/Program.cs
+++ b/apps/rhino-compute-server/Program.cs
@@ -39,7 +39,7 @@ public bool Start(HostControl host)
 
       // Start web server
       StartOptions options = new StartOptions();
-      options.Urls.Add("http://localhost:6500");
+      options.Urls.Add("http://localhost:4000");
 
       _ = WebApp.Start<Startup>(options);