diff --git a/build/actions/notes.js b/build/actions/notes.js
index 2de622cb..224a9cee 100644
--- a/build/actions/notes.js
+++ b/build/actions/notes.js
@@ -1,5 +1,7 @@
 (function() {
-  var async, resin;
+  var _, async, resin;
+
+  _ = require('lodash');
 
   async = require('async');
 
@@ -20,6 +22,9 @@
     ],
     permission: 'user',
     action: function(params, options, done) {
+      if (_.isEmpty(params.note)) {
+        return done(new Error('Missing note content'));
+      }
       return resin.models.device.note(options.device, params.note, done);
     }
   };
diff --git a/lib/actions/notes.coffee b/lib/actions/notes.coffee
index 39b5ab15..28317323 100644
--- a/lib/actions/notes.coffee
+++ b/lib/actions/notes.coffee
@@ -1,3 +1,4 @@
+_ = require('lodash')
 async = require('async')
 resin = require('resin-sdk')
 
@@ -25,4 +26,8 @@ exports.set =
 	]
 	permission: 'user'
 	action: (params, options, done) ->
+
+		if _.isEmpty(params.note)
+			return done(new Error('Missing note content'))
+
 		resin.models.device.note(options.device, params.note, done)