diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 51ddfb9da2ff..8ae3eb21e6ae 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -212,7 +212,10 @@ class PreviewController extends BaseController
             }
 
             $entity_obj = $repo->save($request->all(), $entity_obj);
-            $entity_obj->service()->fillDefaults()->save();
+
+            if(!$request->has('entity_id'))
+                $entity_obj->service()->fillDefaults()->save();
+                
             $entity_obj->load('client');
 
             App::forgetInstance('translator');