diff --git a/src/orbit-dependencies.pug b/src/orbit-dependencies.pug
index a0f125f808794ad622165ac5e8679313a73d4ba9..03c928d18d393de5ceb8236d1811d8b92f8544c9 100644
--- a/src/orbit-dependencies.pug
+++ b/src/orbit-dependencies.pug
@@ -29,7 +29,7 @@
         "version": "0.16"
       })
 
-  if(componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects"))
+  if(componentSet.has("chat") || componentSet.has("circles") || componentSet.has("projects") || componentSet.has("spaces"))
     if(!npm.find(e => e.package == "@startinblox/component-chat"))
       npm.push({
         "package": "@startinblox/component-chat",
@@ -82,7 +82,7 @@
     if(!npm.find(e => e.package == "@startinblox/component-poll"))
       npm.push({
         "package": "@startinblox/component-poll",
-        "version": "3.1"
+        "version": "^4.0.0-beta"
       })
 
   if(componentSet.has("directory"))
diff --git a/src/views/partials/widgets/orbit-counter.pug b/src/views/partials/widgets/orbit-counter.pug
index c770cd84c8be10a35a2f2fe0682995dd2c3b5e70..b980ada74aac52a2139b7d394b8ef9022eb89849 100644
--- a/src/views/partials/widgets/orbit-counter.pug
+++ b/src/views/partials/widgets/orbit-counter.pug
@@ -1,4 +1,4 @@
-if componentSet.has('chat') || componentSet.has('circles') || componentSet.has('projects')
+if componentSet.has('chat') || componentSet.has('circles') || componentSet.has('projects') || componentSet.has('spaces')
   solid-widget(name='orbit-counter')
     template
       if componentSet.has('notification')
diff --git a/src/views/partials/widgets/orbit-menu-jabberid.pug b/src/views/partials/widgets/orbit-menu-jabberid.pug
index a558ae84e3cb4cfc57c9d21a606f7e9a54066063..e6ec3b9a0a90b6284f775ac738b0eec0bd761d53 100644
--- a/src/views/partials/widgets/orbit-menu-jabberid.pug
+++ b/src/views/partials/widgets/orbit-menu-jabberid.pug
@@ -1,4 +1,4 @@
-if componentSet.has('chat') || componentSet.has('circles') || componentSet.has('projects')
+if componentSet.has('chat') || componentSet.has('circles') || componentSet.has('projects') || componentSet.has('spaces')
   solid-widget(name='orbit-menu-jabberid')
     template
       div.hidden(