diff --git a/pkg/types/backend.go b/pkg/types/backend.go
index 64c3d0a9a..6992ae90a 100644
--- a/pkg/types/backend.go
+++ b/pkg/types/backend.go
@@ -48,6 +48,11 @@ func (w *Workspace) ToProto() *pb.Workspace {
 		concurrencyLimit = w.ConcurrencyLimit.ToProto()
 	}
 
+	storage := &pb.WorkspaceStorage{}
+	if w.Storage != nil {
+		storage = w.Storage.ToProto()
+	}
+
 	return &pb.Workspace{
 		Id:                 uint32(w.Id),
 		ExternalId:         w.ExternalId,
@@ -56,7 +61,7 @@ func (w *Workspace) ToProto() *pb.Workspace {
 		VolumeCacheEnabled: w.VolumeCacheEnabled,
 		MultiGpuEnabled:    w.MultiGpuEnabled,
 		ConcurrencyLimit:   concurrencyLimit,
-		Storage:            w.Storage.ToProto(),
+		Storage:            storage,
 	}
 }
 
@@ -66,6 +71,11 @@ func NewWorkspaceFromProto(in *pb.Workspace) *Workspace {
 		concurrencyLimit = NewConcurrencyLimitFromProto(in.ConcurrencyLimit)
 	}
 
+	storage := &WorkspaceStorage{}
+	if in.Storage != nil {
+		storage = NewWorkspaceStorageFromProto(in.Storage)
+	}
+
 	return &Workspace{
 		Id:                 uint(in.Id),
 		ExternalId:         in.ExternalId,
@@ -74,6 +84,7 @@ func NewWorkspaceFromProto(in *pb.Workspace) *Workspace {
 		VolumeCacheEnabled: in.VolumeCacheEnabled,
 		MultiGpuEnabled:    in.MultiGpuEnabled,
 		ConcurrencyLimit:   concurrencyLimit,
+		Storage:            storage,
 	}
 }