diff --git a/proxy/image_proxy_test.go b/proxy/image_proxy_test.go
index c658caef..b3c6920f 100644
--- a/proxy/image_proxy_test.go
+++ b/proxy/image_proxy_test.go
@@ -220,6 +220,29 @@ func TestProxyFilterWithSrcset(t *testing.T) {
 	}
 }
 
+func TestProxyFilterWithEmptySrcset(t *testing.T) {
+	os.Clearenv()
+	os.Setenv("PROXY_IMAGES", "all")
+
+	var err error
+	parser := config.NewParser()
+	config.Opts, err = parser.ParseEnvironmentVariables()
+	if err != nil {
+		t.Fatalf(`Parsing failure: %v`, err)
+	}
+
+	r := mux.NewRouter()
+	r.HandleFunc("/proxy/{encodedURL}", func(w http.ResponseWriter, r *http.Request) {}).Name("proxy")
+
+	input := `<p><img src="http://website/folder/image.png" srcset="" alt="test"></p>`
+	expected := `<p><img src="/proxy/aHR0cDovL3dlYnNpdGUvZm9sZGVyL2ltYWdlLnBuZw==" srcset="" alt="test"/></p>`
+	output := ImageProxyRewriter(r, input)
+
+	if expected != output {
+		t.Errorf(`Not expected output: got %s`, output)
+	}
+}
+
 func TestProxyFilterWithPictureSource(t *testing.T) {
 	os.Clearenv()
 	os.Setenv("PROXY_IMAGES", "all")
diff --git a/proxy/proxy.go b/proxy/proxy.go
index a6705638..ad694233 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -14,5 +14,8 @@ import (
 
 // ProxifyURL generates an URL for a proxified resource.
 func ProxifyURL(router *mux.Router, link string) string {
-	return route.Path(router, "proxy", "encodedURL", base64.URLEncoding.EncodeToString([]byte(link)))
+	if link != "" {
+		return route.Path(router, "proxy", "encodedURL", base64.URLEncoding.EncodeToString([]byte(link)))
+	}
+	return ""
 }