diff --git a/pkg/cmd/grafana-cli/main.go b/pkg/cmd/grafana-cli/main.go
index 8c2b0b9c53d..12bebd46898 100644
--- a/pkg/cmd/grafana-cli/main.go
+++ b/pkg/cmd/grafana-cli/main.go
@@ -12,7 +12,9 @@ import (
 var version = "master"
 
 func getGrafanaPluginPath() string {
-	//TODO: try to get path from os:env GF_PLUGIN_FOLDER
+	if os.Getenv("GF_PLUGIN_DIR") != "" {
+		return os.Getenv("GF_PLUGIN_DIR")
+	}
 
 	os := runtime.GOOS
 	if os == "windows" {