diff --git a/compiler/src/dotty/tools/dotc/core/Denotations.scala b/compiler/src/dotty/tools/dotc/core/Denotations.scala
index 816b28177333..85ff51bc19de 100644
--- a/compiler/src/dotty/tools/dotc/core/Denotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/Denotations.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package core
 
-import SymDenotations.{ SymDenotation, ClassDenotation, NoDenotation, LazyType, stillValid, movedToCompanionClass, acceptStale, traceInvalid }
+import SymDenotations.{ SymDenotation, ClassDenotation, NoDenotation, LazyType, stillValid, acceptStale, traceInvalid }
 import Contexts.*
 import Names.*
 import NameKinds.*
@@ -742,6 +742,8 @@ object Denotations {
      *     the old version otherwise.
      *   - If the symbol did not have a denotation that was defined at the current phase
      *     return a NoDenotation instead.
+     *   - If the symbol was first defined in one of the transform phases (after pickling), it should not
+     *     be visible in new runs, so also return a NoDenotation.
      */
     private def bringForward()(using Context): SingleDenotation = {
       this match {
@@ -755,11 +757,7 @@ object Denotations {
       }
       if (!symbol.exists) return updateValidity()
       if (!coveredInterval.containsPhaseId(ctx.phaseId)) return NoDenotation
-      // Moved to a companion class, likely at a later phase (in MoveStatics)
-      this match {
-        case symd: SymDenotation if movedToCompanionClass(symd) => return NoDenotation
-        case _ =>
-      }
+      if (coveredInterval.firstPhaseId >= Phases.firstTransformPhase.id) return NoDenotation
       if (ctx.debug) traceInvalid(this)
       staleSymbolError
     }
diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
index 906e74735097..3904228756a0 100644
--- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
+++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala
@@ -2680,10 +2680,6 @@ object SymDenotations {
         stillValidInOwner(denot)
     }
 
-  def movedToCompanionClass(denot: SymDenotation)(using Context): Boolean =
-    val ownerCompanion = denot.maybeOwner.companionClass
-    stillValid(ownerCompanion) && ownerCompanion.unforcedDecls.contains(denot.name, denot.symbol)
-
   private[SymDenotations] def stillValidInOwner(denot: SymDenotation)(using Context): Boolean = try
     val owner = denot.maybeOwner.denot
     stillValid(owner)
diff --git a/tests/pos-macros/i21844/Macro.scala b/tests/pos-macros/i21844/Macro.scala
new file mode 100644
index 000000000000..31a2c3a5e76f
--- /dev/null
+++ b/tests/pos-macros/i21844/Macro.scala
@@ -0,0 +1,6 @@
+import scala.quoted.*
+
+object Macro:
+  inline def foo = ${ fooImpl }
+  def fooImpl(using Quotes): Expr[Int] =
+    '{ 123 }
diff --git a/tests/pos-macros/i21844/SubClass.scala b/tests/pos-macros/i21844/SubClass.scala
new file mode 100644
index 000000000000..54b0d970e515
--- /dev/null
+++ b/tests/pos-macros/i21844/SubClass.scala
@@ -0,0 +1,3 @@
+class SubClass extends SuperClass
+object SubClass:
+  val foo: Int = Macro.foo
diff --git a/tests/pos-macros/i21844/SuperClassWithLazyVal.scala b/tests/pos-macros/i21844/SuperClassWithLazyVal.scala
new file mode 100644
index 000000000000..60c270f2b277
--- /dev/null
+++ b/tests/pos-macros/i21844/SuperClassWithLazyVal.scala
@@ -0,0 +1,2 @@
+class SuperClass:
+  lazy val xyz: Int = 123