diff --git a/client/src/app/TabsProvider.js b/client/src/app/TabsProvider.js
index 2c537fc8d..c4cdcf97f 100644
--- a/client/src/app/TabsProvider.js
+++ b/client/src/app/TabsProvider.js
@@ -597,7 +597,7 @@ export default class TabsProvider {
       delete this.providersByFileType.form;
     }
 
-    if (Flags.get(DISABLE_RPA)) {
+    if (Flags.get(DISABLE_RPA, true)) {
       delete this.providers.rpa;
       delete this.providersByFileType.rpa;
     }
diff --git a/client/src/app/__tests__/EmptyTabSpec.js b/client/src/app/__tests__/EmptyTabSpec.js
index 8a035bca8..91b707037 100644
--- a/client/src/app/__tests__/EmptyTabSpec.js
+++ b/client/src/app/__tests__/EmptyTabSpec.js
@@ -39,12 +39,11 @@ describe('<EmptyTab>', function() {
       buttons.forEach(wrapper => wrapper.simulate('click'));
 
       // then
-      expect(onAction).to.have.callCount(7);
+      expect(onAction).to.have.callCount(6);
       expect(onAction.args).to.eql([
         [ 'create-cloud-bpmn-diagram', undefined ],
         [ 'create-cloud-dmn-diagram', undefined ],
         [ 'create-cloud-form', undefined ],
-        [ 'create-diagram', { type: 'rpa' } ],
         [ 'create-bpmn-diagram', undefined ],
         [ 'create-dmn-diagram', undefined ],
         [ 'create-form', undefined ]
diff --git a/client/src/app/__tests__/TabsProviderSpec.js b/client/src/app/__tests__/TabsProviderSpec.js
index 0277b1e37..2653cade1 100644
--- a/client/src/app/__tests__/TabsProviderSpec.js
+++ b/client/src/app/__tests__/TabsProviderSpec.js
@@ -218,6 +218,10 @@ describe('TabsProvider', function() {
     it('should replace version placeholder with actual latest version (BPMN)', function() {
 
       // given
+      Flags.init({
+        [DISABLE_RPA]: false
+      });
+
       const tabsProvider = new TabsProvider();
 
       const expectedPlatformVersion = getLatestStablePlatformVersion(ENGINES.PLATFORM);
@@ -478,6 +482,10 @@ describe('TabsProvider', function() {
 
         it('should replace version placeholder with actual latest version (RPA)', function() {
 
+          Flags.init({
+            [DISABLE_RPA]: false
+          });
+
           // given
           const tabsProvider = new TabsProvider();
 
@@ -560,7 +568,8 @@ describe('TabsProvider', function() {
 
     // given
     Flags.init({
-      [DISABLE_CMMN]: false
+      [DISABLE_CMMN]: false,
+      [DISABLE_RPA]: false
     });
 
     const tabsProvider = new TabsProvider();
@@ -873,7 +882,8 @@ describe('TabsProvider', function() {
 
     // given
     Flags.init({
-      [DISABLE_CMMN]: false
+      [DISABLE_CMMN]: false,
+      [DISABLE_RPA]: false
     });
 
     const tabsProvider = new TabsProvider();
@@ -904,7 +914,7 @@ describe('TabsProvider', function() {
       const providerNames = tabsProvider.getProviderNames();
 
       // then
-      expect(providerNames).to.eql([ 'BPMN', 'DMN', 'FORM', 'RPA' ]);
+      expect(providerNames).to.eql([ 'BPMN', 'DMN', 'FORM' ]);
 
     });
 
@@ -913,7 +923,8 @@ describe('TabsProvider', function() {
 
       // given
       Flags.init({
-        [DISABLE_CMMN]: false
+        [DISABLE_CMMN]: false,
+        [DISABLE_RPA]: false
       });
       const tabsProvider = new TabsProvider();
 
@@ -930,7 +941,8 @@ describe('TabsProvider', function() {
 
       // given
       Flags.init({
-        [DISABLE_PLATFORM]: true
+        [DISABLE_PLATFORM]: true,
+        [DISABLE_RPA]: false
       });
       const tabsProvider = new TabsProvider();
 
@@ -1263,7 +1275,8 @@ describe('TabsProvider', function() {
 
     beforeEach(function() {
       Flags.init({
-        [DISABLE_CMMN]: false
+        [DISABLE_CMMN]: false,
+        [DISABLE_RPA]: false
       });
 
       tabsProvider = new TabsProvider();