diff --git a/rpcs3/Emu/RSX/Core/RSXContext.cpp b/rpcs3/Emu/RSX/Core/RSXContext.cpp
index ababec24cc..41fe199f2d 100644
--- a/rpcs3/Emu/RSX/Core/RSXContext.cpp
+++ b/rpcs3/Emu/RSX/Core/RSXContext.cpp
@@ -12,6 +12,13 @@ namespace rsx
 			return {};
 		}
 
+		if (!g_cfg.video.handle_tiled_memory)
+		{
+			// Tiled memory sections will simply be ignored if the option is disabled.
+			// TODO: This option should never be needed.
+			return {};
+		}
+
 		for (const auto& tile : tiles)
 		{
 			if (!tile.bound || tile.location != CELL_GCM_LOCATION_MAIN)
diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h
index 7964a6b195..3dc94c6275 100644
--- a/rpcs3/Emu/system_config.h
+++ b/rpcs3/Emu/system_config.h
@@ -139,6 +139,7 @@ struct cfg_root : cfg::node
 		cfg::_bool write_depth_buffer{ this, "Write Depth Buffer" };
 		cfg::_bool read_color_buffers{ this, "Read Color Buffers" };
 		cfg::_bool read_depth_buffer{ this, "Read Depth Buffer" };
+		cfg::_bool handle_tiled_memory{ this, "Handle Tiled Memory", false, true };
 		cfg::_bool log_programs{ this, "Log shader programs" };
 		cfg::_bool vsync{ this, "VSync" };
 		cfg::_bool debug_output{ this, "Debug output" };