diff --git a/replacements.php b/replacements.php
index be4ad29cfb5..0db6a095d86 100644
--- a/replacements.php
+++ b/replacements.php
@@ -327,7 +327,7 @@ function templatereplace($line, $replacements=array(), $anonymized=false, $quest
if ($thissurvey['format'] == 'A')
{
- if ($thissurvey['tokenanswerspersistence'] != 'Y')
+ if ($thissurvey['tokenanswerspersistence'] != 'Y' || !tableExists('tokens_'.$surveyid))
{
$_saveall = "\t\t\t"
. "\n\t\t\t"; // Show Save So Far button
@@ -339,7 +339,7 @@ function templatereplace($line, $replacements=array(), $anonymized=false, $quest
}
elseif (!isset($_SESSION['step']) || !$_SESSION['step'])
{ //First page, show LOAD
- if ($thissurvey['tokenanswerspersistence'] != 'Y')
+ if ($thissurvey['tokenanswerspersistence'] != 'Y' || !tableExists('tokens_'.$surveyid))
{
$_saveall = "\t\t\t";
}