diff --git a/src/device_manager/view/DevicesView.js b/src/device_manager/view/DevicesView.js
index 6a872d340..c3f6f8000 100644
--- a/src/device_manager/view/DevicesView.js
+++ b/src/device_manager/view/DevicesView.js
@@ -78,7 +78,7 @@ export default class DevicesView extends View {
     collection.each(device => {
       const { name, id } = device.attributes;
       const label = (em && em.t && em.t(`deviceManager.devices.${id}`)) || name;
-      result += `<option value="${id}">${label}</option>`;
+      result += `<option value="${id || name}">${label}</option>`;
     });
 
     return result;
diff --git a/test/specs/device_manager/view/DevicesView.js b/test/specs/device_manager/view/DevicesView.js
index ce090adec..6a0ba7111 100644
--- a/test/specs/device_manager/view/DevicesView.js
+++ b/test/specs/device_manager/view/DevicesView.js
@@ -1,9 +1,8 @@
 import DevicesView from 'device_manager/view/DevicesView';
 import Devices from 'device_manager/model/Devices';
+import { Model } from 'backbone';
 
 describe('DevicesView', () => {
-  var $fixtures;
-  var $fixture;
   var model;
   var view;
   var editorModel;
@@ -12,7 +11,8 @@ describe('DevicesView', () => {
   beforeEach(() => {
     model = new Devices([]);
     view = new DevicesView({
-      collection: model
+      collection: model,
+      config: { em: new Model() }
     });
     document.body.innerHTML = '<div id="fixtures"></div>';
     document.body.querySelector('#fixtures').appendChild(view.render().el);
@@ -37,7 +37,7 @@ describe('DevicesView', () => {
 
   describe('With configs', () => {
     beforeEach(() => {
-      editorModel = new Backbone.Model();
+      editorModel = new Model();
       model = new Devices([{ name: 'test1' }, { name: 'test2' }]);
       view = new DevicesView({
         collection: model,
diff --git a/test/specs/grapesjs/index.js b/test/specs/grapesjs/index.js
index c6a71d0b9..bc2a09e49 100644
--- a/test/specs/grapesjs/index.js
+++ b/test/specs/grapesjs/index.js
@@ -383,7 +383,7 @@ describe('GrapesJS', () => {
 
     test('There is no active device', () => {
       var editor = obj.init(config);
-      expect(editor.getDevice()).toBeFalsy();
+      expect(editor.getDevice()).toBe('desktop');
     });
 
     test('Active another device', () => {