diff --git a/Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m b/Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m
index dfc59269d2d..39a48ed7e04 100644
--- a/Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m
+++ b/Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m
@@ -123,11 +123,11 @@ - (void)retrievePendingDynamicLinkInternal {
   }
   NSURL *uniqueMatchLinkToCheck = [self uniqueMatchLinkToCheck];
 
-  __weak typeof(self) weakSelf = self;
+  __weak __typeof__(self) weakSelf = self;
   FIRPostInstallAttributionCompletionHandler completionHandler =
       ^(NSDictionary *_Nullable dynamicLinkParameters, NSString *_Nullable matchMessage,
         NSError *_Nullable error) {
-        typeof(self) strongSelf = weakSelf;
+        __typeof__(self) strongSelf = weakSelf;
         if (!strongSelf) {
           return;
         }
diff --git a/Firebase/DynamicLinks/FIRDynamicLinks.m b/Firebase/DynamicLinks/FIRDynamicLinks.m
index 8b9448b6f7b..cf02f35c4f8 100644
--- a/Firebase/DynamicLinks/FIRDynamicLinks.m
+++ b/Firebase/DynamicLinks/FIRDynamicLinks.m
@@ -422,10 +422,10 @@ - (nullable FIRDynamicLink *)dynamicLinkFromUniversalLinkURL:(NSURL *)url {
 - (BOOL)handleUniversalLink:(NSURL *)universalLinkURL
                  completion:(FIRDynamicLinkUniversalLinkHandler)completion {
   if ([self matchesShortLinkFormat:universalLinkURL]) {
-    __weak typeof(self) weakSelf = self;
+    __weak __typeof__(self) weakSelf = self;
     [self resolveShortLink:universalLinkURL
                 completion:^(NSURL *url, NSError *error) {
-                  typeof(self) strongSelf = weakSelf;
+                  __typeof__(self) strongSelf = weakSelf;
                   if (strongSelf) {
                     FIRDynamicLink *dynamicLink = [strongSelf dynamicLinkFromCustomSchemeURL:url];
                     dispatch_async(dispatch_get_main_queue(), ^{