diff --git a/src/addon/mod/data/fields/number/providers/handler.ts b/src/addon/mod/data/fields/number/providers/handler.ts
index 40663e8f0..fbf3fe68a 100644
--- a/src/addon/mod/data/fields/number/providers/handler.ts
+++ b/src/addon/mod/data/fields/number/providers/handler.ts
@@ -50,9 +50,10 @@ export class AddonModDataFieldNumberHandler extends AddonModDataFieldTextHandler
      */
     hasFieldDataChanged(field: any, inputData: any, originalFieldData: any): Promise<boolean> | boolean {
         const fieldName = 'f_' + field.id,
-            input = typeof inputData[fieldName] != 'undefined' ? parseFloat(inputData[fieldName]) : '';
+            input = typeof inputData[fieldName] != 'undefined' && inputData[fieldName] !== null ?
+                parseFloat(inputData[fieldName]) : '';
 
-        originalFieldData = (originalFieldData && typeof originalFieldData.content != 'undefined') ?
+        originalFieldData = (originalFieldData && typeof originalFieldData.content != 'undefined' && originalFieldData !== null) ?
             parseFloat(originalFieldData.content) : '';
 
         return input != originalFieldData;