diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 8b5d499d8de8..4d4afc0fa68c 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -106,12 +106,14 @@ class PreviewController extends BaseController
             $invitation->{$request->entity} = $entity_obj;
         }
 
+        if(empty($entity_obj->design_id))
+            $entity_obj->design_id = intval($this->decodePrimaryKey($settings->{$entity_prop."_design_id"}));
+
         /** Generate variables */
         $html = new HtmlEngine($invitation);
         $html->settings = $settings;
         $variables = $html->generateLabelsAndValues();
 
-
         $design = \App\Models\Design::query()->withTrashed()->find($entity_obj->design_id ?? 2);
 
         /* Catch all in case migration doesn't pass back a valid design */