diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java
index d5450de96..d7653676a 100644
--- a/htroot/Bookmarks.java
+++ b/htroot/Bookmarks.java
@@ -141,7 +141,7 @@ public class Bookmarks {
                 }else{
                     bookmark.setPublic(false);
                 }
-                if(((String) post.get("feed")).equals("feed")){
+                if(post.containsKey("feed") && ((String) post.get("feed")).equals("feed")){
                 	bookmark.setFeed(true);
                 }else{
                 	bookmark.setFeed(false);
@@ -195,6 +195,11 @@ public class Bookmarks {
                         } else {
                             prop.put("mode_public", 0);
                         }
+                        if (bookmark.getFeed()) {
+                            prop.put("mode_feed", 1);
+                        } else {
+                            prop.put("mode_feed", 0);
+                        }
                     }
                 }
         }else if(post.containsKey("bookmarksfile")){