diff --git a/reactfire/firebaseApp/sdk.tsx b/reactfire/firebaseApp/sdk.tsx
index 389398f7..fc2c3035 100644
--- a/reactfire/firebaseApp/sdk.tsx
+++ b/reactfire/firebaseApp/sdk.tsx
@@ -1,5 +1,4 @@
 import { useFirebaseApp, preloadRequest, usePreloadedRequest } from '..';
-import { firestore } from 'firebase/app';
 enum SDK {
   ANALYTICS = 'analytics',
   AUTH = 'auth',
@@ -23,22 +22,32 @@ function fetchSDK(sdk: SDK, firebaseApp: firebase.app.App) {
     sdkPromise = Promise.resolve(firebaseApp[sdk]);
   } else {
     switch (sdk) {
-      case SDK.FIRESTORE:
+      case SDK.ANALYTICS:
         sdkPromise = import(
-          /* webpackChunkName: "firestore" */ 'firebase/firestore'
+          /* webpackChunkName: "analytics" */ 'firebase/analytics'
         );
         break;
+      case SDK.AUTH:
+        sdkPromise = import(/* webpackChunkName: "auth" */ 'firebase/auth');
+        break;
       case SDK.DATABASE:
         sdkPromise = import(
           /* webpackChunkName: "database" */ 'firebase/database'
         );
         break;
-      case SDK.AUTH:
-        sdkPromise = import(/* webpackChunkName: "auth" */ 'firebase/auth');
+      case SDK.FIRESTORE:
+        sdkPromise = import(
+          /* webpackChunkName: "firestore" */ 'firebase/firestore'
+        );
         break;
-      case SDK.STORAGE:
+      case SDK.FUNCTIONS:
         sdkPromise = import(
-          /* webpackChunkName: "storage" */ 'firebase/storage'
+          /* webpackChunkName: "functions" */ 'firebase/functions'
+        );
+        break;
+      case SDK.MESSAGING:
+        sdkPromise = import(
+          /* webpackChunkName: "messaging" */ 'firebase/messaging'
         );
         break;
       case SDK.PERFORMANCE:
@@ -46,6 +55,16 @@ function fetchSDK(sdk: SDK, firebaseApp: firebase.app.App) {
           /* webpackChunkName: "performance" */ 'firebase/performance'
         );
         break;
+      case SDK.REMOTE_CONFIG:
+        sdkPromise = import(
+          /* webpackChunkName: "remoteConfig" */ 'firebase/remote-config'
+        );
+        break;
+      case SDK.STORAGE:
+        sdkPromise = import(
+          /* webpackChunkName: "storage" */ 'firebase/storage'
+        );
+        break;
     }
     sdkPromise = sdkPromise.then(() => firebaseApp[sdk]);
   }