diff --git a/src/Pages/Template.php b/src/Pages/Template.php
index a913331..e53bfc5 100644
--- a/src/Pages/Template.php
+++ b/src/Pages/Template.php
@@ -2,17 +2,16 @@
 
 namespace Whitecube\NovaPage\Pages;
 
-use App;
-use Closure;
 use ArrayAccess;
-use Carbon\Carbon;
 use BadMethodCallException;
-use Whitecube\NovaPage\Sources\SourceInterface;
-use Whitecube\NovaPage\Exceptions\ValueNotFoundException;
-use Whitecube\NovaPage\Exceptions\TemplateContentNotFoundException;
+use Carbon\Carbon;
+use Closure;
 use Illuminate\Database\Eloquent\Concerns\HasAttributes;
 use Laravel\Nova\Http\Requests\NovaRequest;
 use Illuminate\Database\Eloquent\Model;
+use Whitecube\NovaPage\Exceptions\TemplateContentNotFoundException;
+use Whitecube\NovaPage\Exceptions\ValueNotFoundException;
+use Whitecube\NovaPage\Sources\SourceInterface;
 
 abstract class Template implements ArrayAccess
 {
diff --git a/src/Sources/Database.php b/src/Sources/Database.php
index 67c1837..5f28350 100644
--- a/src/Sources/Database.php
+++ b/src/Sources/Database.php
@@ -3,8 +3,8 @@
 namespace Whitecube\NovaPage\Sources;
 
 use \App;
-use Illuminate\Support\Facades\DB;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
 use Whitecube\NovaPage\Pages\Template;
 
 class Database implements SourceInterface {
@@ -67,7 +67,7 @@ public function fetch(Template $template)
 
         $attributes = $this->getParsedAttributes(
             $template,
-            $model->attributes ? json_decode($model->attributes, true) : []
+            $model->attributes ? (is_array($model->attributes) ? $model->attributes : json_decode($model->attributes, true)) : []
         );
 
         return [