diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index 44b090b82bd..b4d4391fd9d 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added a Falloff Mode (Linear or Exponential) in the Density Volume for volume blending with Blend Distance.
 - Added support for screen space shadows (directional and point, no area) for shadow matte unlit shader graph.
 - Added support for volumetric clouds in planar reflections.
+- Added an error message when trying to use disk lights with realtime GI (case 1317808).
 
 ### Fixed
 - Fixed Intensity Multiplier not affecting realtime global illumination.
diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs
index b37f3e2f203..409ce21ce2e 100644
--- a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs
+++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs
@@ -222,6 +222,9 @@ static void DrawGeneralContent(SerializedHDLight serialized, Editor owner)
                     case AreaLightShape.Disc:
                         if (!serialized.settings.isCompletelyBaked)
                             EditorGUILayout.HelpBox("Disc Area Lights are baked only.", MessageType.Error);
+                        // Disc lights are not supported in Enlighten
+                        if (!Lightmapping.bakedGI && Lightmapping.realtimeGI)
+                            EditorGUILayout.HelpBox("Disc Area Lights are not supported with realtime GI.", MessageType.Error);
                         break;
                 }
             }