diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 98458153b..6d14580e3 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -16,9 +16,6 @@
 #   public *;
 #}
 
--keep class com.google.gson.reflect.TypeToken { *; }
--keep class * extends com.google.gson.reflect.TypeToken
-
 # Keep line numbers and file names
 -keepattributes SourceFile,LineNumberTable
 
diff --git a/app/src/main/java/com/orgzly/android/db/NotesClipboard.kt b/app/src/main/java/com/orgzly/android/db/NotesClipboard.kt
index b11b26bcf..a8a450214 100644
--- a/app/src/main/java/com/orgzly/android/db/NotesClipboard.kt
+++ b/app/src/main/java/com/orgzly/android/db/NotesClipboard.kt
@@ -1,6 +1,7 @@
 package com.orgzly.android.db
 
 import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
 import com.orgzly.android.App
 import com.orgzly.android.data.DataRepository
 import com.orgzly.android.db.entity.Note
@@ -13,8 +14,8 @@ import java.io.StringWriter
 data class NotesClipboard(val entries: List<Entry> = emptyList()) {
 
     data class Entry(
-            val note: Note,
-            val properties: List<NoteProperty>
+        @SerializedName("note") val note: Note,
+        @SerializedName("properties") val properties: List<NoteProperty>
     )
 
     val count: Int