diff --git a/rslib/src/scheduler/answering/mod.rs b/rslib/src/scheduler/answering/mod.rs
index b5170c7d9..a71c6330f 100644
--- a/rslib/src/scheduler/answering/mod.rs
+++ b/rslib/src/scheduler/answering/mod.rs
@@ -443,10 +443,14 @@ impl Collection {
             .storage
             .get_deck(card.deck_id)?
             .or_not_found(card.deck_id)?;
-        let home_deck = self
-            .storage
-            .get_deck(card.original_or_current_deck_id())?
-            .or_not_found(card.original_or_current_deck_id())?;
+        let home_deck = if card.original_deck_id.0 == 0 {
+            &deck
+        } else {
+            &self
+                .storage
+                .get_deck(card.original_deck_id)?
+                .or_not_found(card.original_deck_id)?
+        };
         let config = self
             .storage
             .get_deck_config(home_deck.config_id().or_invalid("home deck is filtered")?)?