diff --git a/lib/modules/storage/index.js b/lib/modules/storage/index.js
index cda2d3c1..9fa9e6d0 100644
--- a/lib/modules/storage/index.js
+++ b/lib/modules/storage/index.js
@@ -101,11 +101,11 @@ export const statics = {
     STATE_CHANGED: 'state_changed',
   },
   TaskState: {
-    RUNNING: 'RUNNING',
-    PAUSED: 'PAUSED',
-    SUCCESS: 'SUCCESS',
-    CANCELED: 'CANCELED',
-    ERROR: 'ERROR',
+    RUNNING: 'running',
+    PAUSED: 'paused',
+    SUCCESS: 'success',
+    CANCELLED: 'cancelled',
+    ERROR: 'error',
   },
   Native: {
     MAIN_BUNDLE_PATH: FirebaseStorage.MAIN_BUNDLE_PATH,
diff --git a/lib/modules/storage/task.js b/lib/modules/storage/task.js
index f3145d23..dfdba251 100644
--- a/lib/modules/storage/task.js
+++ b/lib/modules/storage/task.js
@@ -13,8 +13,8 @@ export default class StorageTask {
     this.path = storageRef.path;
 
     // 'proxy' original promise
-    this.then = promise.then;
-    this.catch = promise.catch;
+    this.then = promise.then.bind(promise);
+    this.catch = promise.catch.bind(promise);
   }
 
   /**