diff --git a/priv/repo/migrations/20181214121049_add_bookmarks_to_users.exs b/priv/repo/migrations/20181214121049_add_bookmarks_to_users.exs
index 866bfe9fe..55e97ae0e 100644
--- a/priv/repo/migrations/20181214121049_add_bookmarks_to_users.exs
+++ b/priv/repo/migrations/20181214121049_add_bookmarks_to_users.exs
@@ -1,11 +1,9 @@
-defmodule Pleroma.Repo.Migrations.AddBookmarkssToUsers do
+defmodule Pleroma.Repo.Migrations.AddBookmarksToUsers do
   use Ecto.Migration
 
   def change do
     alter table(:users) do
-      add :bookmarks, {:array, :string}
+      add :bookmarks, {:array, :string}, null: false, default: []
     end
-
-    create index(:users, [:bookmarks], using: :gin)
   end
 end
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 9d40a2340..230e8695a 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -1438,18 +1438,21 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
         "status" => "heweoo!"
       })
 
-    response = build_conn()
+    response =
+      build_conn()
       |> assign(:user, user)
       |> post("/api/v1/statuses/#{activity.id}/bookmark")
 
-    bookmarks = build_conn()
+    bookmarks =
+      build_conn()
       |> assign(:user, user)
       |> get("/api/v1/bookmarks")
 
     assert [json_response(response, 200)] == json_response(bookmarks, 200)
     assert json_response(response, 200)["bookmarked"] == true
 
-    response2 = build_conn()
+    response2 =
+      build_conn()
       |> assign(:user, user)
       |> post("/api/v1/statuses/#{activity.id}/unbookmark")