diff --git a/pkg/db/fixtures/favorites.yml b/pkg/db/fixtures/favorites.yml
new file mode 100644
index 000000000..4c53f6690
--- /dev/null
+++ b/pkg/db/fixtures/favorites.yml
@@ -0,0 +1,12 @@
+- entity_id: 1
+  user_id: 1
+  kind: 1
+- entity_id: 15
+  user_id: 6
+  kind: 1
+- entity_id: 34
+  user_id: 13
+  kind: 1
+- entity_id: 23
+  user_id: 12
+  kind: 2
diff --git a/pkg/db/fixtures/lists.yml b/pkg/db/fixtures/lists.yml
index 7cbfadc8b..45336f951 100644
--- a/pkg/db/fixtures/lists.yml
+++ b/pkg/db/fixtures/lists.yml
@@ -207,6 +207,5 @@
   identifier: test23
   owner_id: 12
   namespace_id: 17
-  is_favorite: true
   updated: 2018-12-02 15:13:12
   created: 2018-12-01 15:13:12
diff --git a/pkg/db/fixtures/tasks.yml b/pkg/db/fixtures/tasks.yml
index b12035619..4d944fd1a 100644
--- a/pkg/db/fixtures/tasks.yml
+++ b/pkg/db/fixtures/tasks.yml
@@ -8,7 +8,6 @@
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
   bucket_id: 1
-  is_favorite: true
 - id: 2
   title: 'task #2 done'
   done: true
@@ -141,7 +140,6 @@
   list_id: 6
   index: 1
   bucket_id: 6
-  is_favorite: true
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 16
@@ -317,7 +315,6 @@
   list_id: 20
   index: 20
   bucket_id: 5
-  is_favorite: true
   created: 2018-12-01 01:12:04
   updated: 2018-12-01 01:12:04
 - id: 35
diff --git a/pkg/models/favorites.go b/pkg/models/favorites.go
index 5fcd6070e..35f74ac12 100644
--- a/pkg/models/favorites.go
+++ b/pkg/models/favorites.go
@@ -78,7 +78,7 @@ func isFavorite(s *xorm.Session, entityID int64, a web.Auth, kind FavoriteKind)
 	u, err := user.GetFromAuth(a)
 	if err != nil {
 		// Only error GetFromAuth is if it's a link share and we want to ignore that
-		return
+		return false, nil
 	}
 
 	return s.
@@ -91,7 +91,7 @@ func getFavorites(s *xorm.Session, entityIDs []int64, a web.Auth, kind FavoriteK
 	u, err := user.GetFromAuth(a)
 	if err != nil {
 		// Only error GetFromAuth is if it's a link share and we want to ignore that
-		return
+		return favorites, nil
 	}
 
 	favs := []*Favorite{}
diff --git a/pkg/models/models.go b/pkg/models/models.go
index 869744629..6f5e96395 100644
--- a/pkg/models/models.go
+++ b/pkg/models/models.go
@@ -60,6 +60,7 @@ func GetTables() []interface{} {
 		&UnsplashPhoto{},
 		&SavedFilter{},
 		&Subscription{},
+		&Favorite{},
 	}
 }