diff --git a/devops/internal/service/container.go b/devops/internal/service/container.go
index 6bd99d5bf..7c3796f3a 100644
--- a/devops/internal/service/container.go
+++ b/devops/internal/service/container.go
@@ -220,7 +220,9 @@ func (s *containerServiceImpl) CreateCanvas(graphID string) (canvasInfo devmodel
 		Version:     devmodel.Version,
 		GraphSchema: graphSchema,
 	}
+	s.mu.Lock()
 	c.CanvasInfo = &canvasInfo
+	s.mu.Unlock()
 
 	return canvasInfo, nil
 }
diff --git a/devops/internal/service/container_test.go b/devops/internal/service/container_test.go
index 3deee12d6..ffe46f16a 100644
--- a/devops/internal/service/container_test.go
+++ b/devops/internal/service/container_test.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"reflect"
 	"strconv"
+	"sync"
 	"testing"
 
 	"github.com/bytedance/mockey"
@@ -249,6 +250,52 @@ func Test_containerServiceImpl_CreateCanvas(t *testing.T) {
 		assert.True(t, ok)
 		assert.Equal(t, "graph", c.Name)
 	})
+
+	t.Run("create and get canvas concurrently", func(t *testing.T) {
+		s := newContainerService()
+		g := &compose.GraphInfo{
+			Name:       "graph",
+			InputType:  reflect.TypeOf(map[string]any{}),
+			OutputType: reflect.TypeOf(map[string]any{}),
+		}
+		id, err := s.AddGraphInfo("graph", g)
+		if !assert.NoError(t, err) {
+			return
+		}
+		_, err = s.CreateCanvas(id)
+		if !assert.NoError(t, err) {
+			return
+		}
+
+		errCh := make(chan error, 1600)
+		var wg sync.WaitGroup
+		for i := 0; i < 8; i++ {
+			wg.Add(2)
+			go func() {
+				defer wg.Done()
+				for j := 0; j < 100; j++ {
+					_, err := s.CreateCanvas(id)
+					if err != nil {
+						errCh <- err
+					}
+				}
+			}()
+			go func() {
+				defer wg.Done()
+				for j := 0; j < 100; j++ {
+					_, ok := s.GetCanvas(id)
+					if !ok {
+						errCh <- fmt.Errorf("canvas not found")
+					}
+				}
+			}()
+		}
+		wg.Wait()
+		close(errCh)
+		for err := range errCh {
+			assert.NoError(t, err)
+		}
+	})
 }
 
 func Test_containerServiceImpl_ListGraphs(t *testing.T) {