diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 950f391b0e..d8a67f2cdb 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1926,6 +1926,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 			cur.setCurrentFont();
 			dr.forceBufferUpdate();
 		}
+		break;
 	}
 
 	case LFUN_FILE_INSERT_PLAINTEXT_PARA:
diff --git a/status.20x b/status.20x
index 51d64120e1..fa19bc7b92 100644
--- a/status.20x
+++ b/status.20x
@@ -155,6 +155,8 @@ What's new
 
 - Improve thesaurus dialog completion (bug 8138)
 
+- Fix erroneous error message when calling "buffer-language" manually.
+
 
 * DOCUMENTATION AND LOCALIZATION