diff --git a/CHANGES.md b/CHANGES.md
index e9f06929..389ea7b7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@
 - **Major rewrite of the code** - We've switched to using diffusers under-the-hood, which allows us to release new features faster, and focus on making the UI and installer even easier to use.
 
 ### Detailed changelog
+* 3.0.7 - 11 Dec 2023 - Setting to enable/disable VAE tiling (in the Image Settings panel). Sometimes VAE tiling reduces the quality of the image, so this setting will help control that.
 * 3.0.6 - 18 Sep 2023 - Add thumbnails to embeddings from the UI, using the new `Upload Thumbnail` button in the Embeddings popup. Thanks @JeLuf.
 * 3.0.6 - 15 Sep 2023 - Fix broken embeddings dialog when LoRA information couldn't be fetched.
 * 3.0.6 - 14 Sep 2023 - UI for adding notes to LoRA files (to help you remember which prompts to use). Also added a button to automatically fetch prompts from Civitai for a LoRA file, using the `Import from Civitai` button. Thanks @JeLuf.
diff --git a/ui/easydiffusion/tasks/render_images.py b/ui/easydiffusion/tasks/render_images.py
index 9260349f..50c76c2e 100644
--- a/ui/easydiffusion/tasks/render_images.py
+++ b/ui/easydiffusion/tasks/render_images.py
@@ -278,6 +278,11 @@ def generate_images_internal(
                     setattr(pipe.unet, "_allocate_trt_buffers_backup", pipe.unet._allocate_trt_buffers)
                     delattr(pipe.unet, "_allocate_trt_buffers")
 
+            if task_data.enable_vae_tiling:
+                pipe.enable_vae_tiling()
+            else:
+                pipe.disable_vae_tiling()
+
         images = generate_images(context, callback=callback, **req.dict())
         user_stopped = False
     except UserInitiatedStop:
diff --git a/ui/easydiffusion/types.py b/ui/easydiffusion/types.py
index ec331c29..f16e9aa3 100644
--- a/ui/easydiffusion/types.py
+++ b/ui/easydiffusion/types.py
@@ -84,6 +84,7 @@ class RenderTaskData(TaskData):
     filters: List[str] = []
     filter_params: Dict[str, Dict[str, Any]] = {}
     control_filter_to_apply: Union[str, List[str]] = None
+    enable_vae_tiling: bool = True
 
     show_only_filtered_image: bool = False
     block_nsfw: bool = False
diff --git a/ui/index.html b/ui/index.html
index a7dc2ecd..010263c6 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -35,7 +35,7 @@
             <h1>
                 <img id="logo_img" src="/media/images/icon-512x512.png" >
                 Easy Diffusion
-                <small><span id="version">v3.0.6</span> <span id="updateBranchLabel"></span></small>
+                <small><span id="version">v3.0.7</span> <span id="updateBranchLabel"></span></small>
             </h1>
         </div>
         <div id="server-status">
@@ -387,6 +387,13 @@
                     <tr class="pl-5" id="output_quality_row"><td><label for="output_quality">Image Quality:</label></td><td>
                     <input id="output_quality_slider" name="output_quality" class="editor-slider" value="75" type="range" min="10" max="95"> <input id="output_quality" name="output_quality" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)" inputmode="numeric">
                     </td></tr>
+                    <tr class="pl-5">
+                        <td><label for="tiling">Enable VAE Tiling:</label></td>
+                        <td class="diffusers-restart-needed">
+                            <input id="enable_vae_tiling" name="enable_vae_tiling" type="checkbox" checked>
+                            <label><small>Optimizes memory for larger images</small></label>
+                        </td>
+                    </tr>
                     </table></div>
 
                     <div><ul>
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 101a88e7..ede271df 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -129,6 +129,7 @@ let hypernetworkStrengthField = document.querySelector("#hypernetwork_strength")
 let outputFormatField = document.querySelector("#output_format")
 let outputLosslessField = document.querySelector("#output_lossless")
 let outputLosslessContainer = document.querySelector("#output_lossless_container")
+let enableVAETilingField = document.querySelector("#enable_vae_tiling")
 let blockNSFWField = document.querySelector("#block_nsfw")
 let showOnlyFilteredImageField = document.querySelector("#show_only_filtered_image")
 let updateBranchLabel = document.querySelector("#updateBranchLabel")
@@ -1369,6 +1370,7 @@ function getCurrentUserRequest() {
         if (tilingField.value !== "none") {
             newTask.reqBody.tiling = tilingField.value
         }
+        newTask.reqBody.enable_vae_tiling = enableVAETilingField.checked
     }
     if (testDiffusers.checked && document.getElementById("toggle-tensorrt-install").innerHTML == "Uninstall") {
         // TRT is installed