diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index c4c5bef9..5691a4f2 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -30,8 +30,8 @@ namespace Oqtane.Modules
         [CascadingParameter]
         protected Module ModuleState { get; set; }
 
-        [CascadingParameter]
-        protected ModuleInstance ModuleInstance { get; set; }
+        [Parameter]
+        public ModuleInstance ModuleInstance { get; set; }
 
         // optional interface properties
         public virtual SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } set { } } // default security
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index d63ef4b6..41e7f12e 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -2,9 +2,7 @@
 @inject IStringLocalizer<ModuleInstance> Localizer
 
 <ModuleMessage Message="@_message" Type="@_messagetype" />
-<CascadingValue Value="this" IsFixed="true">
-    @DynamicComponent
-</CascadingValue>
+@DynamicComponent
 @if (_progressindicator)
 {
     <div class="app-progress-indicator"></div>
@@ -39,6 +37,7 @@
                 if (moduleType != null)
                 {
                     builder.OpenComponent(0, moduleType);
+					builder.AddAttribute(1, "ModuleInstance", this);
                     builder.CloseComponent();
                 }
                 else