diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding.java
index 023f76f..ef773ac 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding.java
@@ -102,7 +102,9 @@ public MultiEnvironment bind(@NonNull Run<?, ?> build,
         variableMap.put(getStorageAccountNameVariable(), credentials.getStorageAccountName());
         variableMap.put(getStorageAccountKeyVariable(), credentials.getPlainStorageKey());
         variableMap.put(getBlobEndpointUrlVariable(), credentials.getBlobEndpointURL());
-        variableMap.put(getCdnEndpointUrlVariable(), credentials.getCdnEndpointURL());
+        if (credentials.getCdnEndpointURL() != null) {
+            variableMap.put(getCdnEndpointUrlVariable(), credentials.getCdnEndpointURL());
+        }
         return new MultiEnvironment(variableMap);
     }