diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bfa4a33e6..f5723f93aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Doubled range of ScaleMode slider when set to Custom
 
 ### Removed
+- SSAAx4 option
 
 ### Fixed
 
diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs
index a89cdd9510..e47ba682d4 100644
--- a/voxygen/src/hud/settings_window.rs
+++ b/voxygen/src/hud/settings_window.rs
@@ -2077,14 +2077,13 @@ impl<'a> Widget for SettingsWindow<'a> {
                 /* AaMode::MsaaX4,
                 AaMode::MsaaX8,
                 AaMode::MsaaX16, */
-                AaMode::SsaaX4,
             ];
             let mode_label_list = [
-                "No AA", "FXAA",
+                "No AA",
+                "FXAA",
                 /* "MSAA x4",
                 "MSAA x8",
                 "MSAA x16 (experimental)", */
-                "SSAA x4",
             ];
 
             // Get which AA mode is currently active
diff --git a/voxygen/src/render/mod.rs b/voxygen/src/render/mod.rs
index 245734d67c..2c96ec0020 100644
--- a/voxygen/src/render/mod.rs
+++ b/voxygen/src/render/mod.rs
@@ -91,14 +91,6 @@ pub enum AaMode {
     /// also struggle in the future with deferred shading, so they may be
     /// removed in the future.
     MsaaX16,
-    /// Super-sampling antialiasing, 4 samples per pixel.
-    ///
-    /// Unlike MSAA, SSAA *always* performs 4 samples per pixel, rather than
-    /// trying to choose importance samples at boundary regions, so it works
-    /// much better with techniques like deferred rendering and greedy
-    /// meshing that (without significantly more work) invalidate the
-    /// GPU's assumptions about importance sampling.
-    SsaaX4,
     #[serde(other)]
     None,
 }
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index fbd3d71a6c..a503796dc1 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -448,10 +448,6 @@ impl Renderer {
                 gfx::texture::Kind::D2(upscaled.0, upscaled.1, gfx::texture::AaMode::Single)
             },
             // TODO: Ensure sampling in the shader is exactly between the 4 texels
-            AaMode::SsaaX4 => {
-                // TODO: Figure out how to do upscaling correctly with SSAA
-                gfx::texture::Kind::D2(size.0 * 2, size.1 * 2, gfx::texture::AaMode::Single)
-            },
             AaMode::MsaaX4 => {
                 gfx::texture::Kind::D2(upscaled.0, upscaled.1, gfx::texture::AaMode::Multi(4))
             },
@@ -1852,7 +1848,7 @@ fn create_pipelines(
 
     let anti_alias = Glsl::load_watched(
         &["voxygen.shaders.antialias.", match mode.aa {
-            AaMode::None | AaMode::SsaaX4 => "none",
+            AaMode::None => "none",
             AaMode::Fxaa => "fxaa",
             AaMode::MsaaX4 => "msaa-x4",
             AaMode::MsaaX8 => "msaa-x8",