diff --git a/model/group_syncable.go b/model/group_syncable.go
index afad357a10..e876a4c55f 100644
--- a/model/group_syncable.go
+++ b/model/group_syncable.go
@@ -144,9 +144,7 @@ func (syncable *GroupSyncable) MarshalJSON() ([]byte, error) {
 			Alias: (*Alias)(syncable),
 		})
 	default:
-		return nil, &json.MarshalerError{
-			Err: fmt.Errorf("unknown syncable type: %s", syncable.Type),
-		}
+		return nil, fmt.Errorf("unknown syncable type: %s", syncable.Type)
 	}
 }
 
diff --git a/model/group_syncable_test.go b/model/group_syncable_test.go
new file mode 100644
index 0000000000..525ddf02a4
--- /dev/null
+++ b/model/group_syncable_test.go
@@ -0,0 +1,20 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+package model
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestGroupSyncableMarshal(t *testing.T) {
+	require.NotPanics(t, func() {
+		var syncable GroupSyncable
+		_, err := json.Marshal(&syncable)
+		require.Error(t, err)
+		t.Log(err.Error())
+	}, "marshaling groupsyncable should not panic")
+}