diff --git a/android/src/main/java/io/fullstack/firestack/FirestackStorage.java b/android/src/main/java/io/fullstack/firestack/FirestackStorage.java
index 210a1bd..414ceda 100644
--- a/android/src/main/java/io/fullstack/firestack/FirestackStorage.java
+++ b/android/src/main/java/io/fullstack/firestack/FirestackStorage.java
@@ -146,7 +146,7 @@ public void onFailure(@NonNull Exception exception) {
   public void uploadFile(final String urlStr, final String name, final String filepath, final ReadableMap metadata, final Callback callback) {
     FirebaseStorage storage = FirebaseStorage.getInstance();
 
-    StorageReference storageRef = storage.getReferenceFromUrl(urlStr);
+    StorageReference storageRef = urlStr!=null ? storage.getReferenceFromUrl(urlStr) : storage.getReference();
     StorageReference fileRef = storageRef.child(name);
 
 Log.i(TAG, "From file: " + filepath + " to " + urlStr + " with name " + name);