diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
index d02312a022..1acccb539a 100644
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
@@ -136,7 +136,7 @@ public class DefaultDeviceStateService extends TbApplicationEventListener<Partit
     private ListeningScheduledExecutorService scheduledExecutor;
     private ExecutorService deviceStateExecutor;
     private final ConcurrentMap<TopicPartitionInfo, Set<DeviceId>> partitionedDevices = new ConcurrentHashMap<>();
-    private final ConcurrentMap<DeviceId, DeviceStateData> deviceStates = new ConcurrentHashMap<>();
+    final ConcurrentMap<DeviceId, DeviceStateData> deviceStates = new ConcurrentHashMap<>();
     private final ConcurrentMap<DeviceId, Long> deviceLastSavedActivity = new ConcurrentHashMap<>();
 
     final Queue<Set<TopicPartitionInfo>> subscribeQueue = new ConcurrentLinkedQueue<>();
@@ -498,26 +498,28 @@ public class DefaultDeviceStateService extends TbApplicationEventListener<Partit
     }
 
     @Nonnull
-    private DeviceStateData getOrFetchDeviceStateData(DeviceId deviceId) {
+    DeviceStateData getOrFetchDeviceStateData(DeviceId deviceId) {
         DeviceStateData deviceStateData = deviceStates.get(deviceId);
         if (deviceStateData != null) {
             return deviceStateData;
         }
+        return fetchDeviceStateData(deviceId);
+    }
 
-        Device device = deviceService.findDeviceById(TenantId.SYS_TENANT_ID, deviceId);
-        if (device != null) {
-            try {
-                deviceStateData = fetchDeviceState(device).get();
-                deviceStates.putIfAbsent(deviceId, deviceStateData);
-            } catch (InterruptedException | ExecutionException e) {
-                log.warn("[{}] Failed to fetch device state!", deviceId, e);
-                throw new RuntimeException(e);
-            }
-        } else {
+    DeviceStateData fetchDeviceStateData(final DeviceId deviceId) {
+        final Device device = deviceService.findDeviceById(TenantId.SYS_TENANT_ID, deviceId);
+        if (device == null) {
             log.warn("[{}] Failed to fetch device by Id!", deviceId);
             throw new RuntimeException("Failed to fetch device by Id " + deviceId);
         }
-        return deviceStateData;
+        try {
+            DeviceStateData deviceStateData = fetchDeviceState(device).get();
+            deviceStates.putIfAbsent(deviceId, deviceStateData);
+            return deviceStateData;
+        } catch (InterruptedException | ExecutionException e) {
+            log.warn("[{}] Failed to fetch device state!", deviceId, e);
+            throw new RuntimeException(e);
+        }
     }
 
     private void sendDeviceEvent(TenantId tenantId, DeviceId deviceId, boolean added, boolean updated, boolean deleted) {
diff --git a/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
new file mode 100644
index 0000000000..2ddcfc1579
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
@@ -0,0 +1,98 @@
+/**
+ * ThingsBoard, Inc. ("COMPANY") CONFIDENTIAL
+ *
+ * Copyright © 2016-2021 ThingsBoard, Inc. All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of ThingsBoard, Inc. and its suppliers,
+ * if any.  The intellectual and technical concepts contained
+ * herein are proprietary to ThingsBoard, Inc.
+ * and its suppliers and may be covered by U.S. and Foreign Patents,
+ * patents in process, and are protected by trade secret or copyright law.
+ *
+ * Dissemination of this information or reproduction of this material is strictly forbidden
+ * unless prior written permission is obtained from COMPANY.
+ *
+ * Access to the source code contained herein is hereby forbidden to anyone except current COMPANY employees,
+ * managers or contractors who have executed Confidentiality and Non-disclosure agreements
+ * explicitly covering such access.
+ *
+ * The copyright notice above does not evidence any actual or intended publication
+ * or disclosure  of  this source code, which includes
+ * information that is confidential and/or proprietary, and is a trade secret, of  COMPANY.
+ * ANY REPRODUCTION, MODIFICATION, DISTRIBUTION, PUBLIC  PERFORMANCE,
+ * OR PUBLIC DISPLAY OF OR THROUGH USE  OF THIS  SOURCE CODE  WITHOUT
+ * THE EXPRESS WRITTEN CONSENT OF COMPANY IS STRICTLY PROHIBITED,
+ * AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES.
+ * THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR RELATED INFORMATION
+ * DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS,
+ * OR TO MANUFACTURE, USE, OR SELL ANYTHING THAT IT  MAY DESCRIBE, IN WHOLE OR IN PART.
+ */
+package org.thingsboard.server.service.state;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.tenant.TenantService;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.queue.discovery.PartitionService;
+import org.thingsboard.server.service.queue.TbClusterService;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultDeviceStateServiceTest {
+
+    @Mock
+    TenantService tenantService;
+    @Mock
+    DeviceService deviceService;
+    @Mock
+    AttributesService attributesService;
+    @Mock
+    TimeseriesService tsService;
+    @Mock
+    TbClusterService clusterService;
+    @Mock
+    PartitionService partitionService;
+    @Mock
+    DeviceStateData deviceStateDataMock;
+
+    DeviceId deviceId = DeviceId.fromString("00797a3b-7aeb-4b5b-b57a-c2a810d0f112");
+
+    DefaultDeviceStateService service;
+
+    @Before
+    public void setUp() {
+        service = spy(new DefaultDeviceStateService(tenantService, deviceService, attributesService, tsService, clusterService, partitionService));
+    }
+
+    @Test
+    public void givenDeviceIdFromDeviceStatesMap_whenGetOrFetchDeviceStateData_thenNoStackOverflow() {
+        DeviceStateData deviceStateDataMock = Mockito.mock(DeviceStateData.class);
+        service.deviceStates.put(deviceId, deviceStateDataMock);
+        DeviceStateData deviceStateData = service.getOrFetchDeviceStateData(deviceId);
+        assertThat(deviceStateData, is(deviceStateDataMock));
+        Mockito.verify(service, never()).fetchDeviceStateData(deviceId);
+    }
+
+    @Test
+    public void givenDeviceIdWithoutDeviceStateInMap_whenGetOrFetchDeviceStateData_thenFetchDeviceStateData() {
+        service.deviceStates.clear();
+        DeviceStateData deviceStateData = service.getOrFetchDeviceStateData(deviceId);
+        assertThat(deviceStateData, is(deviceStateDataMock));
+        Mockito.verify(service, never()).fetchDeviceStateData(deviceId);
+    }
+
+
+}
\ No newline at end of file