diff --git a/nodejs/eks/cluster.ts b/nodejs/eks/cluster.ts
index 636ce8924..353ea4aa4 100644
--- a/nodejs/eks/cluster.ts
+++ b/nodejs/eks/cluster.ts
@@ -705,19 +705,6 @@ export function createCore(
         { parent: parent },
     );
 
-    // Add CSI Driver for Storage
-    const ebsCsiDriver = new aws.eks.Addon(
-        `${name}-aws-ebs-csi-driver`, 
-        {
-            addonName: "aws-ebs-csi-driver",
-            clusterName: eksCluster.name,
-        },
-        {
-            parent,
-            provider: args.creationRoleProvider ? args.creationRoleProvider.provider : provider,
-        },
-    );
-
     // Add any requested StorageClasses.
     const storageClasses = args.storageClasses || {};
     const userStorageClasses = {} as UserStorageClasses;
@@ -1779,6 +1766,19 @@ export function createCluster(
         }
     }
 
+    if (defaultNodeGroup){
+        // Add CSI Driver for Storage
+        const ebsCsiDriver = new aws.eks.Addon(
+            `${name}-aws-ebs-csi-driver`, 
+            {
+                addonName: "aws-ebs-csi-driver",
+                clusterName: core.cluster.name
+            },
+            {
+                parent: self,
+            },
+        );
+    }
     // Export the cluster's kubeconfig with a dependency upon the cluster's autoscaling group. This will help
     // ensure that the cluster's consumers do not attempt to use the cluster until its workers are attached.
     const kubeconfig = pulumi.all(configDeps).apply(([kc]) => kc);