diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c
index d021941a90..b7c2b493d3 100644
--- a/src/windows/top_toolbar.c
+++ b/src/windows/top_toolbar.c
@@ -947,7 +947,7 @@ void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid_x, sin
 		type = 1;
 	}
 
-	if (type == 0){
+	if (type == 0 && !gCheatsDisableSupportLimits) {
 		RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_TOOL_CTRL_PRESSED, uint8) = 0;
 		RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_TOOL_SHIFT_PRESSED, uint8) = 0;
 	}
diff --git a/src/world/map.c b/src/world/map.c
index 8ed9721923..a3434ca198 100644
--- a/src/world/map.c
+++ b/src/world/map.c
@@ -2134,7 +2134,7 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi
 					}
 				}
 				if(gCheatsDisableClearanceChecks || !(scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG_REQUIRE_FLAT_SURFACE) || z != 0 || F64F1D != 0 || !(map_element->properties.surface.slope & 0x1F)){
-					if(scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG18 || z == 0){
+					if(gCheatsDisableSupportLimits || scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG18 || z == 0){
 					l_6E0B78: ;
 						int bp = quadrant;
 						int zLow = F64EC8 / 8;