diff --git a/pkg/workflow_execution.go b/pkg/workflow_execution.go
index 1693c32..2a46c38 100644
--- a/pkg/workflow_execution.go
+++ b/pkg/workflow_execution.go
@@ -184,7 +184,7 @@ func injectContainerResourceQuotas(wf *wfv1.Workflow, template *wfv1.Template, s
 		parts := strings.Split(strings.Replace(value, "}}", "", -1), ".")
 		paramName := parts[len(parts)-1]
 		for _, param := range wf.Spec.Arguments.Parameters {
-			if param.Name == paramName {
+			if param.Name == paramName && param.Value != nil {
 				value = *param.Value
 				break
 			}
diff --git a/server/workflow_template_server.go b/server/workflow_template_server.go
index 6d7f9f2..5ef24dc 100644
--- a/server/workflow_template_server.go
+++ b/server/workflow_template_server.go
@@ -18,9 +18,11 @@ func NewWorkflowTemplateServer() *WorkflowTemplateServer {
 }
 
 func apiWorkflowTemplate(wft *v1.WorkflowTemplate) *api.WorkflowTemplate {
-
 	var aParams []*api.Parameter
 	for _, p := range wft.Parameters {
+		if p.Value == nil {
+			continue
+		}
 		ap := api.Parameter{
 			Name:  p.Name,
 			Value: *p.Value,