diff --git a/SS14.MapServer/Controllers/GitHubWebhookController.cs b/SS14.MapServer/Controllers/GitHubWebhookController.cs
index 02aa9c3..3d5bea4 100644
--- a/SS14.MapServer/Controllers/GitHubWebhookController.cs
+++ b/SS14.MapServer/Controllers/GitHubWebhookController.cs
@@ -286,7 +286,7 @@ private string GetGridImageUrl(Guid mapGuid, int gridId)
     {
         //Can't access Url.Action here
         return
-            $"{_serverConfiguration.Host.Scheme}://{_serverConfiguration.Host.Host}:{_serverConfiguration.Host.Port}/api/Image/grid/{mapGuid}/{gridId}";
+            $"{_serverConfiguration.Host.Scheme}://{_serverConfiguration.Host.Host}:{_serverConfiguration.Host.Port}{_serverConfiguration.PathBase}/api/Image/grid/{mapGuid}/{gridId}";
     }
 }
 
diff --git a/SS14.MapServer/Controllers/MapController.cs b/SS14.MapServer/Controllers/MapController.cs
index bf49382..9ae3108 100644
--- a/SS14.MapServer/Controllers/MapController.cs
+++ b/SS14.MapServer/Controllers/MapController.cs
@@ -288,7 +288,7 @@ private Map SetMapGridUrls(Map map)
                 "Image",
                 new { id = map.MapGuid, gridId = grid.GridId },
                 _serverConfiguration.Host.Scheme,
-                $"{_serverConfiguration.Host.Host}:{_serverConfiguration.Host.Port}"
+                $"{_serverConfiguration.Host.Host}:{_serverConfiguration.Host.Port}{_serverConfiguration.PathBase}"
             );
         }
         map.Grids.Sort((grid, grid1) => grid1.Extent.CompareTo(grid.Extent));