diff --git a/pkg/functions/function.go b/pkg/functions/function.go
index 86c96321ba..cc17a6f273 100644
--- a/pkg/functions/function.go
+++ b/pkg/functions/function.go
@@ -862,6 +862,9 @@ func (f Function) ImageNameWithDigest(newDigest string) string {
 		return f.Build.Image
 	}
 	image := f.Build.Image
+	if image == "" {
+		return ""
+	}
 
 	// overwrite current digest
 	shaIndex := strings.Index(image, "@sha256:")
diff --git a/pkg/functions/function_unit_test.go b/pkg/functions/function_unit_test.go
index 60335c3a99..1f5412d347 100644
--- a/pkg/functions/function_unit_test.go
+++ b/pkg/functions/function_unit_test.go
@@ -115,6 +115,11 @@ func TestFunction_ImageWithDigest(t *testing.T) {
 			fields: fields{Image: "image-registry.openshift-image-registry.svc.cluster.local:50000/default/bar@sha256:42", ImageDigest: ""},
 			want:   "image-registry.openshift-image-registry.svc.cluster.local:50000/default/bar@sha256:42",
 		},
+		{
+			name:   "Empty image with digest",
+			fields: fields{Image: "", ImageDigest: "sha256:42"},
+			want:   "",
+		},
 	}
 	//TODO: gauron99 - this is gonna need to be changed (probably) because:
 	// 1: imageDigest now doesn't have a dedicated structure member (resolved?)