diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e49c833..9ff7cdda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+3.8.7
+========================
+* Fixed bug in recorder servlet. Actions for unpin and notes were mixed up
+* 
+
 3.8.6
 ========================
 * Added setting to disable the online check for paused models
diff --git a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
index fb42c4a0..0e8bf92f 100644
--- a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
+++ b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
@@ -163,14 +163,14 @@ public class RecorderServlet extends AbstractCtbrecServlet {
                     resp.getWriter().write("]}");
                     break;
                 case "unpin":
-                    recorder.setNote(request.recording, request.recording.getNote());
+                    recorder.unpin(request.recording);
                     recAdapter = moshi.adapter(Recording.class);
                     resp.getWriter().write("{\"status\": \"success\", \"msg\": \"Note saved\", \"recordings\": [");
                     resp.getWriter().write(recAdapter.toJson(request.recording));
                     resp.getWriter().write("]}");
                     break;
                 case "setNote":
-                    recorder.unpin(request.recording);
+                    recorder.setNote(request.recording, request.recording.getNote());
                     recAdapter = moshi.adapter(Recording.class);
                     resp.getWriter().write("{\"status\": \"success\", \"msg\": \"List of recordings\", \"recordings\": [");
                     resp.getWriter().write(recAdapter.toJson(request.recording));