diff --git a/service_provider.go b/service_provider.go
index c97886d0..13278de0 100644
--- a/service_provider.go
+++ b/service_provider.go
@@ -1614,8 +1614,6 @@ func (sp *ServiceProvider) nameIDFormat() string {
 	case "":
 		// To maintain library back-compat, use "transient" if unset.
 		nameIDFormat = string(TransientNameIDFormat)
-	case UnspecifiedNameIDFormat:
-		// Spec defines an empty value as "unspecified" so don't set one.
 	default:
 		nameIDFormat = string(sp.AuthnNameIDFormat)
 	}
diff --git a/service_provider_test.go b/service_provider_test.go
index 35103d6b..680568b3 100644
--- a/service_provider_test.go
+++ b/service_provider_test.go
@@ -95,7 +95,7 @@ func TestSPCanSetAuthenticationNameIDFormat(t *testing.T) {
 	s.AuthnNameIDFormat = UnspecifiedNameIDFormat
 	req, err = s.MakeAuthenticationRequest("", HTTPRedirectBinding, HTTPPostBinding)
 	assert.Check(t, err)
-	assert.Check(t, is.Equal("", *req.NameIDPolicy.Format))
+	assert.Check(t, is.Equal(string(UnspecifiedNameIDFormat), *req.NameIDPolicy.Format))
 
 	// explicitly set to "emailAddress"
 	s.AuthnNameIDFormat = EmailAddressNameIDFormat