diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index f879f028..801e7d16 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -320,18 +320,18 @@
                             </select>
                         </div>
                     </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="runtime" HelpText="The interactive render mode for modules" ResourceKey="Runtime">Interactivity: </Label>
+                        <div class="col-sm-9">
+                            <select id="runtime" class="form-select" @bind="@_runtime" required>
+                                <option value="@Runtimes.Server">@(SharedLocalizer["Runtime" + @Runtimes.Server])</option>
+                                <option value="@Runtimes.WebAssembly">@(SharedLocalizer["Runtime" + @Runtimes.WebAssembly])</option>
+                                <option value="@Runtimes.Auto">@(SharedLocalizer["Runtime" + @Runtimes.Auto])</option>
+                            </select>
+                        </div>
+                    </div>
                     @if (_rendermode == RenderModes.Interactive)
                     {
-                        <div class="row mb-1 align-items-center">
-                            <Label Class="col-sm-3" For="runtime" HelpText="The interactive render mode for the site" ResourceKey="Runtime">Interactivity: </Label>
-                            <div class="col-sm-9">
-                                <select id="runtime" class="form-select" @bind="@_runtime" required>
-                                    <option value="@Runtimes.Server">@(SharedLocalizer["Runtime" + @Runtimes.Server])</option>
-                                    <option value="@Runtimes.WebAssembly">@(SharedLocalizer["Runtime" + @Runtimes.WebAssembly])</option>
-                                    <option value="@Runtimes.Auto">@(SharedLocalizer["Runtime" + @Runtimes.Auto])</option>
-                                </select>
-                            </div>
-                        </div>
                         <div class="row mb-1 align-items-center">
                             <Label Class="col-sm-3" For="prerender" HelpText="Specifies if the site supports prerendering" ResourceKey="Prerender">Prerender? </Label>
                             <div class="col-sm-9">
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index e9ee4a1c..0ebd9787 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -80,19 +80,16 @@ else
                     </select>
                 </div>
             </div>
-            @if (_rendermode == RenderModes.Interactive)
-            {
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="runtime" HelpText="The interactive render mode for the site" ResourceKey="Runtime">Interactivity: </Label>
-                    <div class="col-sm-9">
-                        <select id="runtime" class="form-select" @bind="@_runtime" required>
-                            <option value="@Runtimes.Server">@(SharedLocalizer["Runtime" + @Runtimes.Server])</option>
-                            <option value="@Runtimes.WebAssembly">@(SharedLocalizer["Runtime" + @Runtimes.WebAssembly])</option>
-                            <option value="@Runtimes.Auto">@(SharedLocalizer["Runtime" + @Runtimes.Auto])</option>
-                        </select>
-                    </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="runtime" HelpText="The interactive render mode for modules" ResourceKey="Runtime">Interactivity: </Label>
+                <div class="col-sm-9">
+                    <select id="runtime" class="form-select" @bind="@_runtime" required>
+                        <option value="@Runtimes.Server">@(SharedLocalizer["Runtime" + @Runtimes.Server])</option>
+                        <option value="@Runtimes.WebAssembly">@(SharedLocalizer["Runtime" + @Runtimes.WebAssembly])</option>
+                        <option value="@Runtimes.Auto">@(SharedLocalizer["Runtime" + @Runtimes.Auto])</option>
+                    </select>
                 </div>
-            }
+            </div>
             <div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="tenant" HelpText="Select the database for the site" ResourceKey="Tenant">Database: </Label>
                 <div class="col-sm-9">
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index 1e4609a7..6761e06d 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -424,7 +424,7 @@
     <value>Hybrid Enabled?</value>
   </data>
   <data name="Runtime.HelpText" xml:space="preserve">
-    <value>The interactive render mode for the site</value>
+    <value>The interactive render mode for modules</value>
   </data>
   <data name="Runtime.Text" xml:space="preserve">
     <value>Interactivity:</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
index 64f8fb7c..27eac08a 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Sites/Add.resx
@@ -247,7 +247,7 @@
     <value>Enter Connection String</value>
   </data>
   <data name="Runtime.HelpText" xml:space="preserve">
-    <value>The interactive render mode for the site</value>
+    <value>The interactive render mode for modules</value>
   </data>
   <data name="Runtime.Text" xml:space="preserve">
     <value>Interactivity:</value>
diff --git a/Oqtane.Shared/Models/Site.cs b/Oqtane.Shared/Models/Site.cs
index aa2f2900..f5d4cb01 100644
--- a/Oqtane.Shared/Models/Site.cs
+++ b/Oqtane.Shared/Models/Site.cs
@@ -74,7 +74,7 @@ namespace Oqtane.Models
         public string RenderMode { get; set; }
 
         /// <summary>
-        /// The interactive render mode for the site ie. Server,WebAssembly,Auto (only applies to Interactive rendermode)
+        /// The interactive render mode for modules ie. Server,WebAssembly,Auto
         /// </summary>
         public string Runtime { get; set; }