Index: composite.module
===================================================================
--- composite.module	(revision 2533)
+++ composite.module	(working copy)
@@ -503,6 +503,12 @@
 
     case 'insert':
     case 'update':
+      if (!isset($node->composite_layout)) {
+        $default_set = variable_get('composite_default_set_' . $node->type, '--');
+        if ($default_set != '--') {
+          $node->composite_layout = intval($default_set);
+        }
+      }
       if (isset($node->composite_layout) && is_numeric($node->composite_layout)) {
         // A numeric composite_layout is actually a layout set
         // But we zero out composite_layout just in case the set isn't found.