diff --git a/src/Func.cc b/src/Func.cc
index e6047df71e..ac64d64d28 100644
--- a/src/Func.cc
+++ b/src/Func.cc
@@ -339,7 +339,9 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
         f->SetTriggerAssoc(parent->GetTriggerAssoc());
     }
 
+#if DEBUG
     g_frame_stack.push_back(f.get()); // used for backtracing
+#endif
     const CallExpr* call_expr = parent ? parent->GetCall() : nullptr;
     call_stack.emplace_back(CallInfo{call_expr, this, *args});
 
@@ -391,7 +393,9 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
         catch ( InterpreterException& e ) {
             // Already reported, but now determine whether to unwind further.
             if ( Flavor() == FUNC_FLAVOR_FUNCTION ) {
+#if DEBUG
                 g_frame_stack.pop_back();
+#endif
                 call_stack.pop_back();
                 // Result not set b/c exception was thrown
                 throw;
@@ -448,7 +452,9 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
         g_trace_state.LogTrace("Function return: %s\n", d.Description());
     }
 
+#if DEBUG
     g_frame_stack.pop_back();
+#endif
 
     return result;
 }
diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index 070aad5308..119e8b1e70 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -1105,7 +1105,9 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
         auto [body, scope] = get_global_stmts();
         StmtFlowType flow;
         Frame f(scope->Length(), nullptr, nullptr);
+#ifdef DEBUG
         g_frame_stack.push_back(&f);
+#endif
 
         try {
             body->Exec(&f, flow);
@@ -1113,7 +1115,9 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
             reporter->FatalError("failed to execute script statements at top-level scope");
         }
 
+#ifdef DEBUG
         g_frame_stack.pop_back();
+#endif
     }
 
     clear_script_analysis();