diff --git a/services/gif/gif.go b/services/gif/gif.go
index 793293bc5..bec3d93a7 100644
--- a/services/gif/gif.go
+++ b/services/gif/gif.go
@@ -149,11 +149,14 @@ func (api *API) GetFavoriteGifs() (favoriteGifs []Gif, err error) {
 	if err != nil {
 		return nil, err
 	}
+	favoriteGifs = make([]Gif, 0)
 	savedFavGifs := []Gif{}
-	err = json.Unmarshal(gifs, &savedFavGifs)
-	if err != nil {
-		return nil, err
+	if len(gifs) > 0 {
+		err = json.Unmarshal(gifs, &savedFavGifs)
+		if err != nil {
+			return nil, err
+		}
+		favoriteGifs = savedFavGifs
 	}
-	favoriteGifs = savedFavGifs
 	return favoriteGifs, nil
 }