diff --git a/src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx b/src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx
index 24dd547e..16bfe37b 100644
--- a/src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx
+++ b/src/packages/ce/src/datatype/components/inputs/json/DataTypeJSONInputComponent.tsx
@@ -43,7 +43,7 @@ export const DataTypeJSONInputComponent: React.FC<DataTypeJSONInputComponentProp
         setCollapsedStateRaw(prev => ({...prev, [path.join(".")]: collapsed}))
     }
 
-    const handleEntryClick = (entry: EditableJSONEntry) => {
+    const handleEntryClick = (entry: EditableJSONEntry | undefined) => {
         setEditEntry(entry)
         setEditDialogOpen(true)
     }
@@ -71,6 +71,9 @@ export const DataTypeJSONInputComponent: React.FC<DataTypeJSONInputComponentProp
                                              formValidation?.setValue?.(value)
                                              onChangeDebounced(value)
                                          }}
+                                         wrapperComponent={{
+                                             onClick: () => handleEntryClick(undefined)
+                                         }}
                                          suggestions={suggestions}
                                          formValidation={formValidation}>
                 <DataTypeJSONInputTreeComponent
diff --git a/src/packages/ce/src/flow/components/FlowCreateDialogComponent.tsx b/src/packages/ce/src/flow/components/FlowCreateDialogComponent.tsx
index 1a1dd677..c2fa9782 100644
--- a/src/packages/ce/src/flow/components/FlowCreateDialogComponent.tsx
+++ b/src/packages/ce/src/flow/components/FlowCreateDialogComponent.tsx
@@ -99,7 +99,9 @@ export const FlowCreateDialogComponent: React.FC<FlowCreateDialogComponentProps>
             flowService.flowCreate({
                 // @ts-ignore
                 flow: {
-                    settings: [],
+                    settings: selectedFlowType?.flowTypeSettings?.map(setting => ({
+                        value: setting?.defaultValue !== null && setting?.defaultValue !== undefined ? setting?.defaultValue : null,
+                    })) ?? [],
                     name: name,
                     type: type,
                     nodes: [],
@@ -114,7 +116,7 @@ export const FlowCreateDialogComponent: React.FC<FlowCreateDialogComponentProps>
                 }
             })
         })
-    }, [flowService])
+    }, [flowService, selectedFlowType])
 
     React.useEffect(() => {
         setCreateDialogOpen(open)
diff --git a/src/packages/ce/src/flow/services/Flow.service.ts b/src/packages/ce/src/flow/services/Flow.service.ts
index e8993a19..1e38d5d2 100644
--- a/src/packages/ce/src/flow/services/Flow.service.ts
+++ b/src/packages/ce/src/flow/services/Flow.service.ts
@@ -314,12 +314,12 @@ export class FlowService extends ReactiveArrayService<FlowView, FlowDependencies
             flow.settings.nodes = []
         }
 
-        flow.settings.nodes = flowType?.flowTypeSettings?.map((_, index) => {
+        flow.settings.nodes = flowType?.flowTypeSettings?.map((flowTypeSetting, index) => {
             const flowSetting = flow.settings?.nodes?.[index]
             if (!flowSetting) {
                 return {
                     __typename: 'FlowSetting',
-                    value: null,
+                    value: flowTypeSetting?.defaultValue !== null && flowTypeSetting?.defaultValue !== undefined ? flowTypeSetting?.defaultValue : null,
                 }
             }
 
@@ -365,12 +365,12 @@ export class FlowService extends ReactiveArrayService<FlowView, FlowDependencies
             node.parameters.nodes = []
         }
 
-        node.parameters.nodes = functionDefinition?.parameterDefinitions?.nodes?.map((_, index) => {
+        node.parameters.nodes = functionDefinition?.parameterDefinitions?.nodes?.map((nodeParameterDefinition, index) => {
             const nodeParameter = node.parameters?.nodes?.[index]
             if (!nodeParameter) {
                 return {
                     __typename: "NodeParameter",
-                    value: null,
+                    value: nodeParameterDefinition?.defaultValue !== null && nodeParameterDefinition?.defaultValue !== undefined ? nodeParameterDefinition?.defaultValue : null,
                 }
             }
 
diff --git a/src/packages/ce/src/flowtype/services/fragments/FlowType.fragment.graphql b/src/packages/ce/src/flowtype/services/fragments/FlowType.fragment.graphql
index 16af3d35..653703d9 100644
--- a/src/packages/ce/src/flowtype/services/fragments/FlowType.fragment.graphql
+++ b/src/packages/ce/src/flowtype/services/fragments/FlowType.fragment.graphql
@@ -41,6 +41,7 @@ fragment FlowType on FlowType {
         unique
         optional
         hidden
+        defaultValue
         names {
             __typename
             code
diff --git a/src/packages/ce/src/function/hooks/Function.suggestion.hook.ts b/src/packages/ce/src/function/hooks/Function.suggestion.hook.ts
index c08606e3..b30dba2a 100644
--- a/src/packages/ce/src/function/hooks/Function.suggestion.hook.ts
+++ b/src/packages/ce/src/function/hooks/Function.suggestion.hook.ts
@@ -27,10 +27,13 @@ export const useFunctionSuggestions = () => {
                         id: p?.id,
                         identifier: p?.identifier
                     },
-                    value: p?.defaultValue ? {
+                    value: p?.defaultValue !== undefined && p?.defaultValue !== null ? {
                         __typename: "LiteralValue",
                         value: p.defaultValue.value
-                    } : null
+                    } : {
+                        __typename: "LiteralValue",
+                        value: null
+                    }
                 }))
             }
         })),