diff --git a/lib/container.js b/lib/container.js
index f962fb9..86fdeac 100644
--- a/lib/container.js
+++ b/lib/container.js
@@ -989,7 +989,7 @@ Container.prototype.logs = function(opts, callback) {
   var optsf = {
     path: '/containers/' + this.id + '/logs?',
     method: 'GET',
-    isStream: true,
+    isStream: args.opts.follow || false,
     statusCodes: {
       200: true,
       404: 'no such container',
diff --git a/lib/service.js b/lib/service.js
index 1ece998..6346409 100644
--- a/lib/service.js
+++ b/lib/service.js
@@ -143,7 +143,7 @@ Service.prototype.logs = function(opts, callback) {
   var optsf = {
     path: '/services/' + this.id + '/logs?',
     method: 'GET',
-    isStream: true,
+    isStream: args.opts.follow || false,
     statusCodes: {
       200: true,
       404: 'no such service',