diff --git a/server/http/http.go b/server/http/http.go
index 2dcefc872c051ce25b7dbeb2d6b2ea31b5fc95cc..9fdfacf8b59de544b777172994adf08d1139abd2 100644
--- a/server/http/http.go
+++ b/server/http/http.go
@@ -148,7 +148,9 @@ func getOptions(r *http.Request) map[string]interface{} {
 
 	// TODO: get more options from request body (formdata, json, etc)
 
-	if _, exists := opts[cmds.EncShort]; !exists {
+	_, short := opts[cmds.EncShort]
+	_, long := opts[cmds.EncLong]
+	if !short && !long {
 		opts[cmds.EncShort] = cmds.JSON
 	}