diff --git a/app/Http/Controllers/BlogArticleController.php b/app/Http/Controllers/BlogArticleController.php
index c178279..c9bb8d7 100644
--- a/app/Http/Controllers/BlogArticleController.php
+++ b/app/Http/Controllers/BlogArticleController.php
@@ -75,7 +75,8 @@ public function update(Request $request, $id){
             'title' => $rev->title,
             'category' => $request->input('category'),
             'revision_id' => $rev->id,
-            'handle_name' => $rev->handle_name
+            'handle_name' => $rev->handle_name,
+            'updated_at' => $rev->timestamp,
         ]);
         SlackNotify::notify_article($article, 'updated', $request->user('admin')->name);
         return response(new ArticleResource($article));
diff --git a/app/Models/Article.php b/app/Models/Article.php
index e8ccc2c..ae3225c 100644
--- a/app/Models/Article.php
+++ b/app/Models/Article.php
@@ -16,6 +16,13 @@ class Article extends Model
         'id', 'category', 'title', 'revision_id', 'created_at', 'updated_at', 'handle_name'
     ];
 
+    const UPDATED_AT = NULL;
+
+    protected $dates = [
+        'created_at',
+        'updated_at',
+    ];
+
     protected $primaryKey = 'id';
 
     protected $keyType = 'string';
diff --git a/database/migrations/2020_07_12_184114_set_timestamp_default_value_articles.php b/database/migrations/2020_07_12_184114_set_timestamp_default_value_articles.php
new file mode 100644
index 0000000..61d4b23
--- /dev/null
+++ b/database/migrations/2020_07_12_184114_set_timestamp_default_value_articles.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+class SetTimestampDefaultValueArticles extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('articles', function (Blueprint $table) {
+            if(env('DB_CONNECTION') == 'mysql') {
+                DB::statement('ALTER TABLE articles CHANGE created_at created_at timestamp NOT NULL DEFAULT \'0000-00-00 00:00:00\'');
+                DB::statement('ALTER TABLE articles CHANGE created_at created_at timestamp NOT NULL DEFAULT \'0000-00-00 00:00:00\'');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('articles', function (Blueprint $table) {
+            if(env('DB_CONNECTION') == 'mysql') {
+                DB::statement('ALTER TABLE articles CHANGE created_at created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP');
+                DB::statement('ALTER TABLE articles CHANGE created_at created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP');
+            }
+        });
+    }
+}
diff --git a/tests/BlogArticleTest.php b/tests/BlogArticleTest.php
index a25e807..aa8a339 100644
--- a/tests/BlogArticleTest.php
+++ b/tests/BlogArticleTest.php
@@ -124,6 +124,8 @@ public function test_update() {
                 'status' => 'accepted',
             ]);
 
+            Carbon::setTestNow(Carbon::now()->addSeconds(10));
+
             $this->json('PATCH', "/blog/articles/{$article_id}",
                 [
                     'revision_id' => $revision->id,
@@ -139,11 +141,12 @@ public function test_update() {
 
             $this->assertEquals($revision->title, $ret->title);
             $this->assertEquals($revision->id, $ret->revision_id);
+            $this->assertEquals($revision->timestamp->toIso8601ZuluString(), $ret->updated_at);
 
             $article = Article::find($article_id);
             $this->assertEquals($revision->title, $article->title);
             $this->assertEquals($revision->id, $article->revision_id);
-
+            Carbon::setTestNow();
         }
     }