diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
index 54b49550..20aa9576 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
@@ -108,10 +108,10 @@ public class DeviceControl {
 			msg.setData("Timeout. Device did not response to this command.");
 			resultHolder.invokeAllResult(msg);
 		});
-		resultHolder.put(key, uuid, result);
 		if (resultHolder.exist(key, null)){
 			return result;
 		}
+		resultHolder.put(key, uuid, result);
 		cmder.recordCmd(device, channelId, recordCmdStr, event -> {
             RequestMessage msg = new RequestMessage();
 			msg.setId(uuid);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
index 314bbae3..f6228af4 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
@@ -88,10 +88,10 @@ public class DownloadController {
 			msg.setData("Timeout");
 			resultHolder.invokeAllResult(msg);
 		});
-		resultHolder.put(key, uuid, result);
 		if(resultHolder.exist(key, null)) {
 			return result;
 		}
+		resultHolder.put(key, uuid, result);
 		Device device = storager.queryVideoDevice(deviceId);
 		StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
 		if (streamInfo != null) {