diff --git a/ChangeLog.md b/ChangeLog.md
index a33fe67b..bdc3d1a2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -5,6 +5,7 @@ Starting with v1.31.6, this file will contain a record of major features and upd
 ## Upcoming
 
 - Removed unused options from `%load`([Link to PR](https://github.com/aws/graph-notebook/pull/662))
+- Made EncryptionKey optional in Neptune CloudFormation template ([Link to PR](https://github.com/aws/graph-notebook/pull/663))
 
 ## Release 4.5.1 (July 31, 2024)
 
diff --git a/additional-databases/sagemaker/neptune-notebook-cloudformation/neptune-workbench-stack.yaml b/additional-databases/sagemaker/neptune-notebook-cloudformation/neptune-workbench-stack.yaml
index fd0ca3fb..c6cb89cc 100644
--- a/additional-databases/sagemaker/neptune-notebook-cloudformation/neptune-workbench-stack.yaml
+++ b/additional-databases/sagemaker/neptune-notebook-cloudformation/neptune-workbench-stack.yaml
@@ -101,6 +101,11 @@ Conditions:
     Fn::Equals:
       - !Ref SageMakerNotebookRoleArn
       - ""
+  UseEncryptionKey:
+    Fn::Not:
+      - Fn::Equals:
+        - Ref: EncryptionKey
+        - ""
 
 Resources:
   NeptuneNotebookInstance:
@@ -133,7 +138,10 @@ Resources:
         - Key: aws-neptune-resource-id
           Value: !Ref NeptuneClusterResourceId
       KmsKeyId:
-        Ref: EncryptionKey
+        Fn::If:
+          - UseEncryptionKey
+          - Ref: EncryptionKey
+          - Ref: AWS::NoValue
 
   NeptuneNotebookInstanceLifecycleConfig:
     Type: AWS::SageMaker::NotebookInstanceLifecycleConfig