diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index 69229d406c..cada234137 100644
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -172,11 +172,16 @@ int ast_streamfile(struct ast_channel *c, const char *filename, const char *pref
 int ast_stream_and_wait(struct ast_channel *chan, const char *file,
 	const char *language, const char *digits);
 
-/*! Stops a stream */
-/*!
+/*! 
+ * \brief Stops a stream 
+ *
  * \param c The channel you wish to stop playback on
+ *
  * Stop playback of a stream 
- * Returns 0 regardless
+ *
+ * \retval 0 always
+ *
+ * \note The channel does not need to be locked before calling this function.
  */
 int ast_stopstream(struct ast_channel *c);
 
diff --git a/main/file.c b/main/file.c
index 65dd5e1b91..fcdc357464 100644
--- a/main/file.c
+++ b/main/file.c
@@ -136,6 +136,8 @@ int ast_format_unregister(const char *name)
 
 int ast_stopstream(struct ast_channel *tmp)
 {
+	ast_channel_lock(tmp);
+
 	/* Stop a running stream if there is one */
 	if (tmp->stream) {
 		ast_closestream(tmp->stream);
@@ -148,6 +150,9 @@ int ast_stopstream(struct ast_channel *tmp)
 		ast_closestream(tmp->vstream);
 		tmp->vstream = NULL;
 	}
+
+	ast_channel_unlock(tmp);
+
 	return 0;
 }