diff --git a/controllers/front/return.php b/controllers/front/return.php
index 5dccbef7..7d2dd195 100755
--- a/controllers/front/return.php
+++ b/controllers/front/return.php
@@ -147,7 +147,12 @@ public function initContent()
             )
         );
 
-        $this->setTemplate(SaferPayConfig::SAFERPAY_TEMPLATE_LOCATION . '/front/saferpay_wait.tpl');
+        if (SaferPayConfig::isVersion17()) {
+            $this->setTemplate(SaferPayConfig::SAFERPAY_TEMPLATE_LOCATION . '/front/saferpay_wait.tpl');
+            return;
+        }
+
+        $this->setTemplate('saferpay_wait_16.tpl');
     }
 
     protected function processAjax()
diff --git a/views/templates/front/saferpay_wait_16.tpl b/views/templates/front/saferpay_wait_16.tpl
new file mode 100644
index 00000000..8f81bbd6
--- /dev/null
+++ b/views/templates/front/saferpay_wait_16.tpl
@@ -0,0 +1,32 @@
+{**
+ *NOTICE OF LICENSE
+ *
+ *This source file is subject to the Open Software License (OSL 3.0)
+ *that is bundled with this package in the file LICENSE.txt.
+ *It is also available through the world-wide-web at this URL:
+ *http://opensource.org/licenses/osl-3.0.php
+ *If you did not receive a copy of the license and are unable to
+ *obtain it through the world-wide-web, please send an email
+ *to license@prestashop.com so we can send you a copy immediately.
+ *
+ *DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ *versions in the future. If you wish to customize PrestaShop for your
+ *needs please refer to http://www.prestashop.com for more information.
+ *
+ *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
+ *@copyright SIX Payment Services
+ *@license   SIX Payment Services
+ *}
+{block name='header'}
+{/block}
+{block name='head'}
+{/block}
+
+{block name='content'}
+    {include file="./saferpay_wait.tpl"}
+{/block}
+
+{block name='footer'}
+{/block}