diff --git a/util/homeassistant/connection.go b/util/homeassistant/connection.go
index 7e9c7022e..a17889c23 100644
--- a/util/homeassistant/connection.go
+++ b/util/homeassistant/connection.go
@@ -36,7 +36,7 @@ func NewConnection(log *util.Logger, uri, home string) (*Connection, error) {
 		Helper: request.NewHelper(log),
 		instance: &proxyInstance{
 			home: home,
-			uri:  uri,
+			uri:  util.DefaultScheme(strings.TrimSuffix(uri, "/"), "http"),
 		},
 	}
 
diff --git a/util/homeassistant/service.go b/util/homeassistant/service.go
index 0c944085c..04bd8a704 100644
--- a/util/homeassistant/service.go
+++ b/util/homeassistant/service.go
@@ -31,7 +31,7 @@ func getInstances(w http.ResponseWriter, req *http.Request) {
 }
 
 func getEntities(w http.ResponseWriter, req *http.Request) {
-	uri := req.URL.Query().Get("uri")
+	uri := util.DefaultScheme(strings.TrimSuffix(req.URL.Query().Get("uri"), "/"), "http")
 	if uri == "" {
 		jsonError(w, http.StatusBadRequest, errors.New("missing uri"))
 		return