diff --git a/src/Provider.spec.tsx b/src/Provider.spec.tsx
index 84cda0a..f2891a6 100644
--- a/src/Provider.spec.tsx
+++ b/src/Provider.spec.tsx
@@ -83,6 +83,8 @@ describe('OptimizelyProvider', () => {
   });
 
   it('should render successfully without user or userId provided', () => {
+    // @ts-ignore
+    mockReactClient.user = undefined;
     render(<OptimizelyProvider optimizely={mockReactClient} />);
 
     expect(mockReactClient.setUser).toHaveBeenCalledWith(DefaultUser);
@@ -95,6 +97,8 @@ describe('OptimizelyProvider', () => {
   });
 
   it('should succeed just userAttributes provided', () => {
+    // @ts-ignore
+    mockReactClient.user = undefined;
     render(<OptimizelyProvider optimizely={mockReactClient} userAttributes={{ attr1: 'value1' }} />);
 
     expect(mockReactClient.setUser).toHaveBeenCalledWith({
diff --git a/src/Provider.tsx b/src/Provider.tsx
index b0da5ca..5a126b5 100644
--- a/src/Provider.tsx
+++ b/src/Provider.tsx
@@ -73,6 +73,11 @@ export class OptimizelyProvider extends React.Component<OptimizelyProviderProps,
       };
       // deprecation warning
       logger.warn('Passing userId and userAttributes as props is deprecated, please switch to using `user` prop');
+    } else if (optimizely.user) {
+      finalUser = {
+        id: optimizely.user.id,
+        attributes: optimizely.user.attributes || userAttributes || {},
+      };
     } else {
       finalUser = {
         id: DefaultUser.id,