diff --git a/common/plugins.js b/common/plugins.js
index ef7a5ee8fb..b8a0538712 100644
--- a/common/plugins.js
+++ b/common/plugins.js
@@ -1407,6 +1407,8 @@
 
 		getCurrentPluginGuid : function()
 		{
+			if (this.queueCommands.length === 0)
+				return "";
 			return this.queueCommands[0].guid;
 		},
 
@@ -1480,6 +1482,8 @@
 		setPluginMethodReturnAsync : function()
 		{
 			let currentPlugin = this.getCurrentPluginGuid();
+			if (currentPlugin === "")
+				return;
 			if (this.runnedPluginsMap[currentPlugin])
 				this.runnedPluginsMap[currentPlugin].methodReturnAsync = true;
 		},