diff --git a/docker/api/container.py b/docker/api/container.py
index dde132542..918f8a3a9 100644
--- a/docker/api/container.py
+++ b/docker/api/container.py
@@ -50,7 +50,7 @@ def attach(self, container, stdout=True, stderr=True,
         }
 
         u = self._url("/containers/{0}/attach", container)
-        response = self._post(u, headers=headers, params=params, stream=stream)
+        response = self._post(u, headers=headers, params=params, stream=True)
 
         return self._read_from_socket(
             response, stream, self._check_is_tty(container)
diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py
index f8b474a11..a972c1cdc 100644
--- a/tests/integration/api_container_test.py
+++ b/tests/integration/api_container_test.py
@@ -1092,20 +1092,28 @@ def test_run_container_reading_socket(self):
         command = "printf '{0}'".format(line)
         container = self.client.create_container(BUSYBOX, command,
                                                  detach=True, tty=False)
-        ident = container['Id']
-        self.tmp_containers.append(ident)
+        self.tmp_containers.append(container)
 
         opts = {"stdout": 1, "stream": 1, "logs": 1}
-        pty_stdout = self.client.attach_socket(ident, opts)
+        pty_stdout = self.client.attach_socket(container, opts)
         self.addCleanup(pty_stdout.close)
 
-        self.client.start(ident)
+        self.client.start(container)
 
         next_size = next_frame_size(pty_stdout)
         self.assertEqual(next_size, len(line))
         data = read_exactly(pty_stdout, next_size)
         self.assertEqual(data.decode('utf-8'), line)
 
+    def test_attach_no_stream(self):
+        container = self.client.create_container(
+            BUSYBOX, 'echo hello'
+        )
+        self.tmp_containers.append(container)
+        self.client.start(container)
+        output = self.client.attach(container, stream=False, logs=True)
+        assert output == 'hello\n'.encode(encoding='ascii')
+
 
 class PauseTest(BaseAPIIntegrationTest):
     def test_pause_unpause(self):