diff --git a/packages/server/src/utils/builders/index.ts b/packages/server/src/utils/builders/index.ts
index a00102ec0..52f8a881e 100644
--- a/packages/server/src/utils/builders/index.ts
+++ b/packages/server/src/utils/builders/index.ts
@@ -192,7 +192,8 @@ export const mechanizeDockerContainer = async (
 			})),
 		},
 		UpdateConfig,
-		...(StopGracePeriod && { StopGracePeriod }),
+		...(StopGracePeriod !== undefined &&
+			StopGracePeriod !== null && { StopGracePeriod }),
 	};
 
 	try {
diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts
index 6569f912b..b784904f1 100644
--- a/packages/server/src/utils/docker/utils.ts
+++ b/packages/server/src/utils/docker/utils.ts
@@ -397,6 +397,11 @@ export const generateConfigContainer = (
 		stopGracePeriodSwarm,
 	} = application;
 
+	const sanitizedStopGracePeriodSwarm =
+		typeof stopGracePeriodSwarm === "bigint"
+			? Number(stopGracePeriodSwarm)
+			: stopGracePeriodSwarm;
+
 	const haveMounts = mounts && mounts.length > 0;
 
 	return {
@@ -445,8 +450,9 @@ export const generateConfigContainer = (
 						Order: "start-first",
 					},
 				}),
-		...(stopGracePeriodSwarm && {
-			StopGracePeriod: stopGracePeriodSwarm,
+		...(sanitizedStopGracePeriodSwarm !== null &&
+			sanitizedStopGracePeriodSwarm !== undefined && {
+			StopGracePeriod: sanitizedStopGracePeriodSwarm,
 		}),
 		...(networkSwarm
 			? {