diff --git a/src/applications/ponder/controller/PonderAnswerSaveController.php b/src/applications/ponder/controller/PonderAnswerSaveController.php
--- a/src/applications/ponder/controller/PonderAnswerSaveController.php
+++ b/src/applications/ponder/controller/PonderAnswerSaveController.php
@@ -32,7 +32,7 @@
       return id(new AphrontDialogResponse())->setDialog($dialog);
     }
 
-    $answer = PonderAnswer::initializeNewAnswer($viewer);
+    $answer = PonderAnswer::initializeNewAnswer($viewer, $question);
 
     // Question Editor
 
diff --git a/src/applications/ponder/storage/PonderAnswer.php b/src/applications/ponder/storage/PonderAnswer.php
--- a/src/applications/ponder/storage/PonderAnswer.php
+++ b/src/applications/ponder/storage/PonderAnswer.php
@@ -26,15 +26,18 @@
 
   private $userVotes = array();
 
-  public static function initializeNewAnswer(PhabricatorUser $actor) {
+  public static function initializeNewAnswer(
+    PhabricatorUser $actor,
+    PonderQuestion $question) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
       ->withClasses(array('PhabricatorPonderApplication'))
       ->executeOne();
 
     return id(new PonderAnswer())
-      ->setQuestionID(0)
+      ->setQuestionID($question->getID())
       ->setContent('')
+      ->attachQuestion($question)
       ->setAuthorPHID($actor->getPHID())
       ->setVoteCount(0)
       ->setStatus(PonderAnswerStatus::ANSWER_STATUS_VISIBLE);