diff --git a/portal.go b/portal.go
index 9c1f3bb1..ffe319c1 100644
--- a/portal.go
+++ b/portal.go
@@ -963,13 +963,8 @@ func (portal *Portal) storeReactionInDB(
 
 func (portal *Portal) addSignalQuote(content *event.MessageEventContent, quote *signalmeow.IncomingSignalMessageQuoteData) {
 	if quote != nil {
-		puppet := portal.bridge.DB.Puppet.GetBySignalID(quote.QuotedSender)
-		if puppet == nil {
-			portal.log.Warn().Msgf("Couldn't find puppet for quoted sender %s", quote.QuotedSender)
-			return
-		}
 		originalMessage := portal.bridge.DB.Message.GetBySignalID(
-			puppet.SignalID, quote.QuotedTimestamp, portal.ChatID, portal.Receiver,
+			quote.QuotedSender, quote.QuotedTimestamp, portal.ChatID, portal.Receiver,
 		)
 		if originalMessage == nil {
 			portal.log.Warn().Msgf("Couldn't find message with Signal ID %s/%d", quote.QuotedSender, quote.QuotedTimestamp)