diff --git a/controllers/new.go b/controllers/new.go
index 82d8bbf..406aa31 100644
--- a/controllers/new.go
+++ b/controllers/new.go
@@ -49,7 +49,7 @@ func PostNewHandler(c echo.Context) error {
 		}
 	}
 	// Determine language from file extension if not set.
-	if lang == "" {
+	if lang == "" && name != "" {
 		lexer := lexers.Match(name)
 		if lexer != nil {
 			lang = lexer.Config().Name
@@ -61,10 +61,13 @@ func PostNewHandler(c echo.Context) error {
 		return utils.RenderErrorToast(c, "server-side error occurred")
 	}
 
+	binPartial := pages.BinPartial(createdFile)
+	setTitle := components.SetTitle(name)
+
 	utils.SetHeader(c, "HX-Push", fmt.Sprintf("/b/%s", code))
 	return utils.RenderComponents(c, http.StatusOK,
-		pages.BinPartial(createdFile),
-		components.SetTitle(file.Filename),
+		binPartial,
+		setTitle,
 	)
 }