diff --git a/database/migrations/2018_03_08_150414_add_slack_notifications.php b/database/migrations/2018_03_08_150414_add_slack_notifications.php
index 0a6eb4565b6e..820802bd12c0 100644
--- a/database/migrations/2018_03_08_150414_add_slack_notifications.php
+++ b/database/migrations/2018_03_08_150414_add_slack_notifications.php
@@ -13,6 +13,17 @@ class AddSlackNotifications extends Migration
      */
     public function up()
     {
+        Schema::table('activities', function ($table) {
+            $table->integer('task_id')->unsigned()->change();
+            $table->integer('client_id')->unsigned()->nullable()->change();
+        });
+
+        DB::statement('UPDATE activities SET client_id = NULL WHERE client_id = 0');
+
+        Schema::table('activities', function ($table) {
+            $table->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
+        });
+
         Schema::table('users', function ($table) {
             $table->string('slack_webhook_url')->nullable();
             $table->string('accepted_terms_version')->nullable();
@@ -30,23 +41,6 @@ class AddSlackNotifications extends Migration
             $table->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
         });
 
-        Schema::table('activities', function ($table) {
-            $table->integer('task_id')->unsigned()->change();
-        });
-
-        DB::statement('UPDATE activities SET client_id = NULL WHERE client_id = 0');
-
-        Schema::table('activities', function ($table) {
-            $table->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
-            $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade');
-            $table->foreign('payment_id')->references('id')->on('payments')->onDelete('cascade');
-            $table->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
-            $table->foreign('credit_id')->references('id')->on('credits')->onDelete('cascade');
-            $table->foreign('task_id')->references('id')->on('tasks')->onDelete('cascade');
-            $table->foreign('invitation_id')->references('id')->on('invitations')->onDelete('cascade');
-            $table->foreign('expense_id')->references('id')->on('expenses')->onDelete('cascade');
-        });
-
         Schema::table('companies', function ($table) {
             $table->dropForeign('companies_payment_id_foreign');
         });