diff --git a/src/newgrf_analysis.cpp b/src/newgrf_analysis.cpp
index 77ba2daa24..3f42934f36 100644
--- a/src/newgrf_analysis.cpp
+++ b/src/newgrf_analysis.cpp
@@ -270,7 +270,7 @@ void DeterministicSpriteGroup::AnalyseCallbacks(AnalyseCallbackOperation &op) co
 		if ((op.mode == ACOM_CB_VAR || op.mode == ACOM_CB_REFIT_CAPACITY) && adjust.variable == 0x47) {
 			op.result_flags |= ACORF_CB_REFIT_CAP_SEEN_VAR_47;
 		}
-		if (adjust.variable == 0x7E && adjust.subroutine != nullptr) {
+		if (adjust.variable == 0x7E && adjust.subroutine != nullptr && op.mode != ACOM_CB36_PROP) {
 			adjust.subroutine->AnalyseCallbacks(op);
 		}
 		if (op.mode == ACOM_INDUSTRY_TILE && this->var_scope == VSG_SCOPE_SELF && (adjust.variable == 0x44 || (adjust.variable == 0x61 && adjust.parameter == 0))) {