diff --git a/embark-ui/src/components/DataWrapper.js b/embark-ui/src/components/DataWrapper.js
index 71eb5719d..7215a6a0b 100644
--- a/embark-ui/src/components/DataWrapper.js
+++ b/embark-ui/src/components/DataWrapper.js
@@ -9,14 +9,14 @@ const DataWrapper = ({error, loading, shouldRender, render, ...rest}) => {
     return <Error error={error} />;
   }
 
-  if (loading) {
-    return <Loading />;
-  }
-
   if (shouldRender) {
     return render(rest);
   }
 
+  if (loading) {
+    return <Loading />;
+  }
+
   return <React.Fragment />;
 };