diff --git a/pkg/api/apierrors/folder.go b/pkg/api/apierrors/folder.go
index 8006001356c..531636bc9c9 100644
--- a/pkg/api/apierrors/folder.go
+++ b/pkg/api/apierrors/folder.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -43,6 +44,11 @@ func ToFolderErrorResponse(err error) response.Response {
 		return response.JSON(http.StatusPreconditionFailed, util.DynMap{"status": "version-mismatch", "message": dashboards.ErrFolderVersionMismatch.Error()})
 	}
 
+	// folder errors are wrapped in an error util, so this is the only way of comparing errors
+	if err.Error() == folder.ErrMaximumDepthReached.Error() {
+		return response.JSON(http.StatusBadRequest, util.DynMap{"messageId": "folder.maximum-depth-reached", "message": "Maximum nested folder depth reached"})
+	}
+
 	return response.ErrOrFallback(http.StatusInternalServerError, "Folder API error", err)
 }
 
diff --git a/pkg/api/apierrors/folder_test.go b/pkg/api/apierrors/folder_test.go
new file mode 100644
index 00000000000..e3d70bded31
--- /dev/null
+++ b/pkg/api/apierrors/folder_test.go
@@ -0,0 +1,83 @@
+package apierrors
+
+import (
+	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/folder"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/stretchr/testify/require"
+)
+
+func TestToFolderErrorResponse(t *testing.T) {
+	tests := []struct {
+		name  string
+		input error
+		want  response.Response
+	}{
+		{
+			name:  "dashboard error",
+			input: dashboards.DashboardErr{StatusCode: 400, Reason: "Dashboard Error", Status: "error"},
+			want:  response.Error(400, "Dashboard Error", dashboards.DashboardErr{StatusCode: 400, Reason: "Dashboard Error", Status: "error"}),
+		},
+		{
+			name:  "folder title empty",
+			input: dashboards.ErrFolderTitleEmpty,
+			want:  response.Error(400, "folder title cannot be empty", nil),
+		},
+		{
+			name:  "dashboard type mismatch",
+			input: dashboards.ErrDashboardTypeMismatch,
+			want:  response.Error(400, "Dashboard cannot be changed to a folder", dashboards.ErrDashboardTypeMismatch),
+		},
+		{
+			name:  "dashboard invalid uid",
+			input: dashboards.ErrDashboardInvalidUid,
+			want:  response.Error(400, "uid contains illegal characters", dashboards.ErrDashboardInvalidUid),
+		},
+		{
+			name:  "dashboard uid too long",
+			input: dashboards.ErrDashboardUidTooLong,
+			want:  response.Error(400, "uid too long, max 40 characters", dashboards.ErrDashboardUidTooLong),
+		},
+		{
+			name:  "folder access denied",
+			input: dashboards.ErrFolderAccessDenied,
+			want:  response.Error(http.StatusForbidden, "Access denied", dashboards.ErrFolderAccessDenied),
+		},
+		{
+			name:  "folder not found",
+			input: dashboards.ErrFolderNotFound,
+			want:  response.JSON(http.StatusNotFound, util.DynMap{"status": "not-found", "message": dashboards.ErrFolderNotFound.Error()}),
+		},
+		{
+			name:  "folder with same uid exists",
+			input: dashboards.ErrFolderWithSameUIDExists,
+			want:  response.Error(http.StatusConflict, dashboards.ErrFolderWithSameUIDExists.Error(), nil),
+		},
+		{
+			name:  "folder version mismatch",
+			input: dashboards.ErrFolderVersionMismatch,
+			want:  response.JSON(http.StatusPreconditionFailed, util.DynMap{"status": "version-mismatch", "message": dashboards.ErrFolderVersionMismatch.Error()}),
+		},
+		{
+			name:  "folder max depth reached",
+			input: folder.ErrMaximumDepthReached,
+			want:  response.JSON(http.StatusBadRequest, util.DynMap{"messageId": "folder.maximum-depth-reached", "message": "Maximum nested folder depth reached"}),
+		},
+		{
+			name:  "fallback error",
+			input: errors.New("some error"),
+			want:  response.ErrOrFallback(http.StatusInternalServerError, "Folder API error", errors.New("some error")),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			resp := ToFolderErrorResponse(tt.input)
+			require.Equal(t, tt.want, resp)
+		})
+	}
+}