diff --git a/packages/xo-web/src/common/add-subscriptions.js b/packages/xo-web/src/common/add-subscriptions.js
index 0f14f7209..a927f879b 100644
--- a/packages/xo-web/src/common/add-subscriptions.js
+++ b/packages/xo-web/src/common/add-subscriptions.js
@@ -7,6 +7,16 @@ const call = fn => fn()
 // callbacks have been correctly initialized when there are circular dependencies
 const addSubscriptions = subscriptions => Component =>
   class SubscriptionWrapper extends React.PureComponent {
+    constructor () {
+      super()
+
+      // provide all props since the beginning (better behavior with Freactal)
+      const state = (this.state = {})
+      Object.keys(subscriptions).forEach(key => {
+        state[key] = undefined
+      })
+    }
+
     _unsubscribes = null
 
     componentWillMount () {