diff --git a/api/pyproject.toml b/api/pyproject.toml
index 2937b4acbe..19512ba722 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "api"
-version = "0.55.0"
+version = "0.55.1"
 description = "Agenta API"
 authors = [{ name = "Mahmoud Mabrouk", email = "mahmoud@agenta.ai" }]
 
diff --git a/sdk/pyproject.toml b/sdk/pyproject.toml
index 6d377a31eb..776db4de91 100644
--- a/sdk/pyproject.toml
+++ b/sdk/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.55.0"
+version = "0.55.1"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <mahmoud@agenta.ai>"]
diff --git a/web/oss/package.json b/web/oss/package.json
index 3472e01313..948a6065cc 100644
--- a/web/oss/package.json
+++ b/web/oss/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@agenta/oss",
-    "version": "0.55.0",
+    "version": "0.55.1",
     "private": true,
     "engines": {
         "node": ">=18"
diff --git a/web/oss/src/components/pages/app-management/index.tsx b/web/oss/src/components/pages/app-management/index.tsx
index a12b65975c..ac22980ab3 100644
--- a/web/oss/src/components/pages/app-management/index.tsx
+++ b/web/oss/src/components/pages/app-management/index.tsx
@@ -56,8 +56,10 @@ const AppManagement: React.FC = () => {
     const setStatusData = useSetAtom(appCreationStatusAtom)
     const resetAppCreation = useSetAtom(resetAppCreationAtom)
     const [statusModalOpen, setStatusModalOpen] = useState(false)
+    const [fetchingCustomWorkflow, setFetchingCustomWorkflow] = useState(false)
     const {openModal} = useCustomWorkflowConfig({
         setStatusModalOpen,
+        setFetchingTemplate: setFetchingCustomWorkflow,
         appId: "",
     })
     const posthog = usePostHogAg()
@@ -226,7 +228,7 @@ const AppManagement: React.FC = () => {
 
             <CreateAppStatusModal
                 open={statusModalOpen}
-                loading={fetchingTemplate}
+                loading={fetchingTemplate || fetchingCustomWorkflow}
                 onErrorRetry={onErrorRetry}
                 onTimeoutRetry={onTimeoutRetry}
                 onCancel={() => {
diff --git a/web/oss/src/lib/helpers/errorHandler.ts b/web/oss/src/lib/helpers/errorHandler.ts
index 127324cc52..f64ab6b751 100644
--- a/web/oss/src/lib/helpers/errorHandler.ts
+++ b/web/oss/src/lib/helpers/errorHandler.ts
@@ -2,6 +2,7 @@ import {message} from "antd"
 
 export const getErrorMessage = (error: any, fallback = "An unknown error occurred!") => {
     let message = fallback
+    if (error == null) return message
     error?.preventDefault && error.preventDefault()
     if (typeof error === "string") message = error
     else if (error.message) message = error.message
diff --git a/web/package.json b/web/package.json
index d387fbcfd1..656ee96e0b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "agenta-web",
-    "version": "0.55.0",
+    "version": "0.55.1",
     "workspaces": [
         "ee",
         "oss",