diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index df98969c262cea0b631504f57abd1353c4ab26d3..dfbaf3a62420ae7bd225f9d0df9e27f73f530910 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -689,7 +689,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
             'limit' => ToolbarModel::LIMIT_PARAM_NAME,
             'modeDefault' => $defaultMode,
             'directionDefault' => $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION,
-            'orderDefault' => $this->_productListHelper->getDefaultSortField(),
+            'orderDefault' => $this->getOrderField(),
             'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
             'url' => $this->getPagerUrl(),
         ];
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 259ca979206e9423fc81d75a4f2fc53e265408f9..88be03a04e71aa40e213699e1c2a3991aefe9646 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -78,7 +78,6 @@ define([
             );
         },
 
-        /*eslint-disable no-unused-vars*/
         /**
          * @param {String} paramName
          * @param {*} paramValue
@@ -100,13 +99,14 @@ define([
             }
             paramData[paramName] = paramValue;
 
+            if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
+                delete paramData[paramName];
+            }
             paramData = $.param(paramData);
 
             location.href = baseUrl + (paramData.length ? '?' + paramData : '');
         }
     });
 
-    /*eslint-enable no-unused-vars*/
-
     return $.mage.productListToolbarForm;
 });