diff --git a/@ornikar/jest-config-react/__mocks__/@storybook/react.js b/@ornikar/jest-config-react/__mocks__/@storybook/react.js
index a7a7573b2..aa7994fb6 100644
--- a/@ornikar/jest-config-react/__mocks__/@storybook/react.js
+++ b/@ornikar/jest-config-react/__mocks__/@storybook/react.js
@@ -85,16 +85,13 @@ exports.storiesOf = groupName => {
               expect(shallowToJson(child.dive())).toMatchSnapshot();
             });
           } else {
-            let belowWrapper = true;
-            const toJsonMap = json => {
-              if (!belowWrapper) return { ...json, props: {} };
-              if (json.type === 'JestStoryWrapper') {
-                belowWrapper = false;
-              }
-              return json;
-            };
             expect(
-              shallowToJson(wrapper, { map: toJsonMap })
+              shallowToJson(
+                wrapper
+                  .find(JestStoryWrapper)
+                  .children()
+                  .shallow()
+              )
             ).toMatchSnapshot();
           }
         });