diff --git a/models/ur_month_timesheet.py b/models/ur_month_timesheet.py
index 2a0c223b4193204656e01a65eeb63ad0061f4218..2d4d8130c90ec0e3c49189a21cef1f852625f0f6 100644
--- a/models/ur_month_timesheet.py
+++ b/models/ur_month_timesheet.py
@@ -83,7 +83,7 @@ class ScopMonthTimesheet(models.Model):
                 lambda x: {
                     "year": x.year,
                     "num_month": x.month,
-                    "month": self._fields["month"].selection[x.month - 1][1],
+                    "month": self._fields["month"].selection[int(x.month) - 1][1],
                 }
             ),
             "values": month_values.mapped("working_time"),
diff --git a/static/src/js/ur_month_timesheet.js b/static/src/js/ur_month_timesheet.js
index 10b2b70ed7622018eb6517e294b1a1952e2ebe2d..dd53939bd56b7daeecc5a18846701a9e590480ed 100644
--- a/static/src/js/ur_month_timesheet.js
+++ b/static/src/js/ur_month_timesheet.js
@@ -11,18 +11,17 @@ odoo.define("cgscop_timesheet.ur_month_timesheet", function (require) {
         template: "ScopMonthTimesheet",
 
         willStart: function () {
-            var deferred = new jQuery.Deferred();
+            var superDef = this._super.apply(this, arguments);
             var self = this;
             this.values = {};
-            this._rpc({
+            var def = this._rpc({
                 model: "ur.month.timesheet",
                 method: "get_month_values",
                 args: [],
             }).then(function (results) {
                 self.values = results;
-                deferred.resolve();
             });
-            return jQuery.when(this._super.apply(this, arguments), deferred);
+            return Promise.all([superDef, def]);
         },
 
         //        Start: function () {},