diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm
index e26181f3e9f..4cc3d184abf 100644
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -406,10 +406,15 @@ let PinnedLinks = {
    */
   unpin: function PinnedLinks_unpin(aLink) {
     let index = this._indexOfLink(aLink);
-    if (index != -1) {
-      this.links[index] = null;
-      this.save();
-    }
+    if (index == -1)
+      return;
+    let links = this.links;
+    links[index] = null;
+    // trim trailing nulls
+    let i=links.length-1;
+    while (i >= 0 && links[i] == null)
+      i--;
+    links.splice(i +1);
   },
 
   /**