diff --git a/lib/concurrent/collection/map/non_concurrent_map_backend.rb b/lib/concurrent/collection/map/non_concurrent_map_backend.rb
index ba86d7c0f..1c9aa8984 100644
--- a/lib/concurrent/collection/map/non_concurrent_map_backend.rb
+++ b/lib/concurrent/collection/map/non_concurrent_map_backend.rb
@@ -95,7 +95,6 @@ def clear
       end
 
       def each_pair
-        return enum_for :each_pair unless block_given?
         dupped_backend.each_pair do |k, v|
           yield k, v
         end
diff --git a/lib/concurrent/map.rb b/lib/concurrent/map.rb
index 814deb008..f3aa55d53 100644
--- a/lib/concurrent/map.rb
+++ b/lib/concurrent/map.rb
@@ -171,6 +171,11 @@ def each_value
       each_pair {|k, v| yield v}
     end unless method_defined?(:each_value)
 
+    def each_pair
+      return enum_for :each_pair unless block_given?
+      super
+    end
+
     alias_method :each, :each_pair unless method_defined?(:each)
 
     def key(value)
diff --git a/spec/concurrent/collection_each_shared.rb b/spec/concurrent/collection_each_shared.rb
index 55de1319c..c4c970707 100644
--- a/spec/concurrent/collection_each_shared.rb
+++ b/spec/concurrent/collection_each_shared.rb
@@ -42,4 +42,20 @@
       end
     end
   end
+
+  context 'when no block is given' do
+    it 'returns an enumerator' do
+      @cache[:a] = 1
+      @cache[:b] = 2
+
+      expect(@cache.send(method)).to be_a Enumerator
+    end
+
+    it 'returns an object which is enumerable' do
+      @cache[:a] = 1
+      @cache[:b] = 2
+
+      expect(@cache.send(method).to_a).to contain_exactly([:a, 1], [:b, 2])
+    end
+  end
 end