diff --git a/templates/default/404.html b/templates/default/404.html
new file mode 100644
index 000000000..b4ee90792
--- /dev/null
+++ b/templates/default/404.html
@@ -0,0 +1,42 @@
+{extends file="layout.tpl"}
+
+{* Body Class *}
+{block name="body-class"}page-404{/block}
+
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+    ['title' => {intl l="404"}, 'url'=>{url path="/404"}]
+    ]}
+{/block}
+
+{block name="main-content"}
+<div class="main">
+    <article id="cart" class="col-main" role="main" aria-labelledby="main-label">
+
+        <h1 id="main-label" class="page_404">
+            404
+            <span>{intl l="The page cannot be found"}</span>
+        </h1>
+
+
+
+        {ifloop rel="product_upsell"}
+            <aside id="products-upsell" role="complementary" aria-labelledby="products-upsell-label">
+                <div class="products-heading">
+                    <h3 id="products-upsell-label">{intl l="Upsell Products"}</h3>
+                </div>
+
+                <div class="products-content">
+                    <ul class="products-grid product-col-5 hover-effect">
+                        {loop name="product_upsell" type="product" promo="yes" limit="5"}
+                            {include file="includes/single-product.html" product_id=$ID hasBtn=true hasDescription=true width="218" height="146"}
+                        {/loop}
+
+                    </ul>
+                </div>
+            </aside><!-- #products-upsell -->
+        {/ifloop}
+
+    </div>
+{/block}
diff --git a/templates/default/assets/less/thelia/global.less b/templates/default/assets/less/thelia/global.less
index b890fe310..1430bdaa4 100755
--- a/templates/default/assets/less/thelia/global.less
+++ b/templates/default/assets/less/thelia/global.less
@@ -3,6 +3,19 @@
 // Main Title
 .page-header { margin-top: 0; }
 
+// 404 Page
+.page_404{
+  color: @brand-primary;
+  font-size: 9em; font-weight: bold;
+  text-align: center;
+
+  span{
+    color : #CCC;
+    display: block;
+    font-size: 15px; font-weight: normal;
+  }
+}
+
 // Collapse
 .no-js .collapse { display: block!important; }