diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0698355581..3609a084d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed `Processing order...` modal closing too early - @grimasod (#4021)
 - Keep registered payment methods after `syncTotals`  - @grimasod (#4020)
 - Added status code to the cache content and use it in cache response - @resubaka (#4014)
+- Disable checking max quantity when manage stock is set to false - @gibkigonzo (#4038)
 
 ## [1.11.0] - 2019.12.20
 
diff --git a/src/themes/default/components/core/ProductQuantity.vue b/src/themes/default/components/core/ProductQuantity.vue
index 65ec18a9ef..ef1af65288 100644
--- a/src/themes/default/components/core/ProductQuantity.vue
+++ b/src/themes/default/components/core/ProductQuantity.vue
@@ -47,6 +47,10 @@ export default {
       type: Number,
       default: undefined
     },
+    checkMaxQuantity: {
+      type: Boolean,
+      default: true
+    },
     loading: {
       type: Boolean,
       default: false
@@ -64,7 +68,7 @@ export default {
       return this.isOnline ? this.maxQuantity : null
     },
     disabled () {
-      return this.isOnline ? !this.maxQuantity : false
+      return this.isOnline ? !this.maxQuantity && this.checkMaxQuantity : false
     },
     name () {
       if (this.isSimpleOrConfigurable && !this.loading && this.showQuantity) {
diff --git a/src/themes/default/pages/Product.vue b/src/themes/default/pages/Product.vue
index a0ae0bd30a..3219be0b79 100644
--- a/src/themes/default/pages/Product.vue
+++ b/src/themes/default/pages/Product.vue
@@ -121,6 +121,7 @@
               :loading="isStockInfoLoading"
               :is-simple-or-configurable="isSimpleOrConfigurable"
               :show-quantity="manageQuantity"
+              :check-max-quantity="manageQuantity"
               @error="handleQuantityError"
             />
             <div class="row m0">