diff --git a/android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java b/android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java
index e86959ae..1fc4d4d1 100644
--- a/android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java
+++ b/android/src/main/java/io/invertase/firebase/firestore/RNFirebaseFirestore.java
@@ -243,7 +243,7 @@ public class RNFirebaseFirestore extends ReactContextBaseJavaModule {
         break;
       case CANCELLED:
         code = ErrorUtils.getCodeWithService(service, "cancelled");
-        message = ErrorUtils.getMessageWithService("The operation was cancelled (typically by the caller).", service, code);
+        message = ErrorUtils.getMessageWithService("The operation was cancelled.", service, code);
         break;
       case UNKNOWN:
         code = ErrorUtils.getCodeWithService(service, "unknown");
diff --git a/ios/RNFirebase/firestore/RNFirebaseFirestore.m b/ios/RNFirebase/firestore/RNFirebaseFirestore.m
index 4115c116..9a7df690 100644
--- a/ios/RNFirebase/firestore/RNFirebaseFirestore.m
+++ b/ios/RNFirebase/firestore/RNFirebaseFirestore.m
@@ -189,8 +189,75 @@ RCT_EXPORT_METHOD(documentUpdate:(NSString *) appName
     NSString *message;
     NSString *service = @"Firestore";
 
-    // TODO: Proper error codes
     switch (nativeError.code) {
+        case FIRFirestoreErrorCodeOK:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"ok"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Ok." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeCancelled:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"cancelled"];
+            message = [RNFirebaseFirestore getMessageWithService:@"The operation was cancelled." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeUnknown:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"unknown"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Unknown error or an error from a different error domain." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeInvalidArgument:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"invalid-argument"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Client specified an invalid argument." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeDeadlineExceeded:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"deadline-exceeded"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Deadline expired before operation could complete." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeNotFound:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"not-found"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Some requested document was not found." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeAlreadyExists:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"already-exists"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Some document that we attempted to create already exists." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodePermissionDenied:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"permission-denied"];
+            message = [RNFirebaseFirestore getMessageWithService:@"The caller does not have permission to execute the specified operation." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeResourceExhausted:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"resource-exhausted"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Some resource has been exhausted, perhaps a per-user quota, or perhaps the entire file system is out of space." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeFailedPrecondition:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"failed-precondition"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Operation was rejected because the system is not in a state required for the operation`s execution." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeAborted:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"aborted"];
+            message = [RNFirebaseFirestore getMessageWithService:@"The operation was aborted, typically due to a concurrency issue like transaction aborts, etc." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeOutOfRange:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"out-of-range"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Operation was attempted past the valid range." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeUnimplemented:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"unimplemented"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Operation is not implemented or not supported/enabled." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeInternal:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"internal"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Internal errors." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeUnavailable:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"unavailable"];
+            message = [RNFirebaseFirestore getMessageWithService:@"The service is currently unavailable." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeDataLoss:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"data-loss"];
+            message = [RNFirebaseFirestore getMessageWithService:@"Unrecoverable data loss or corruption." service:service fullCode:code];
+            break;
+        case FIRFirestoreErrorCodeUnauthenticated:
+            code = [RNFirebaseFirestore getCodeWithService:service code:@"unauthenticated"];
+            message = [RNFirebaseFirestore getMessageWithService:@"The request does not have valid authentication credentials for the operation." service:service fullCode:code];
+            break;
         default:
             code = [RNFirebaseFirestore getCodeWithService:service code:@"unknown"];
             message = [RNFirebaseFirestore getMessageWithService:@"An unknown error occurred." service:service fullCode:code];