diff --git a/ext/mysql2/result.c b/ext/mysql2/result.c
index fbff98137..3e36070e7 100644
--- a/ext/mysql2/result.c
+++ b/ext/mysql2/result.c
@@ -419,7 +419,9 @@ static VALUE rb_mysql_result_fetch_row_stmt(VALUE self, MYSQL_FIELD * fields, co
           ts = (MYSQL_TIME*)result_buffer->buffer;
           seconds = (ts->year*31557600ULL) + (ts->month*2592000ULL) + (ts->day*86400ULL) + (ts->hour*3600ULL) + (ts->minute*60ULL) + ts->second;
 
-          if (seconds < MYSQL2_MIN_TIME || seconds > MYSQL2_MAX_TIME) { // use DateTime instead
+          if (seconds == 0) {
+            val = Qnil;
+          } else if (seconds < MYSQL2_MIN_TIME || seconds > MYSQL2_MAX_TIME) { // use DateTime instead
             VALUE offset = INT2NUM(0);
             if (args->db_timezone == intern_local) {
               offset = rb_funcall(cMysql2Client, intern_local_offset, 0);
diff --git a/spec/mysql2/result_spec.rb b/spec/mysql2/result_spec.rb
index a70b38ef0..6654088e2 100644
--- a/spec/mysql2/result_spec.rb
+++ b/spec/mysql2/result_spec.rb
@@ -297,6 +297,11 @@
       expect(r.first['test']).to be_an_instance_of(Time)
     end
 
+    it "should return nil when timestamp is 0000-00-00T00:00:00" do
+      r = @client.query("SELECT CAST('0000-00-00 00:00:00' AS DATETIME) as test")
+      expect(r.first['test']).to be_nil
+    end
+
     it "should return Time for a TIMESTAMP value when within the supported range" do
       expect(test_result['timestamp_test']).to be_an_instance_of(Time)
       expect(test_result['timestamp_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
diff --git a/spec/mysql2/statement_spec.rb b/spec/mysql2/statement_spec.rb
index dbc185e6b..22f6853b3 100644
--- a/spec/mysql2/statement_spec.rb
+++ b/spec/mysql2/statement_spec.rb
@@ -454,6 +454,11 @@ def stmt_count
       expect(r.first['test']).to be_an_instance_of(Time)
     end
 
+    it "should return nil when timestamp is 0000-00-00T00:00:00" do
+      r = @client.prepare("SELECT CAST('0000-00-00 00:00:00' AS DATETIME) as test").execute
+      expect(r.first['test']).to be_nil
+    end
+
     it "should return Time for a TIMESTAMP value when within the supported range" do
       expect(test_result['timestamp_test']).to be_an_instance_of(Time)
       expect(test_result['timestamp_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')