diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
index 3be43e4ab5ca..2284cbf25e98 100644
--- a/src/ngResource/resource.js
+++ b/src/ngResource/resource.js
@@ -367,7 +367,7 @@ angular.module('ngResource', ['ng']).
       }
     };
 
-    this.$get = ['$http', '$q', function($http, $q) {
+    this.$get = ['$http', '$log', '$q', function($http, $log, $q) {
 
       var noop = angular.noop,
         forEach = angular.forEach,
@@ -578,6 +578,14 @@ angular.module('ngResource', ['ng']).
                 case 'isArray':
                 case 'interceptor':
                   break;
+                case 'timeout':
+                  if (value && !angular.isNumber(value)) {
+                    $log.debug('ngResource:\n' +
+                               '  Only numeric values are allowed as `timeout`.\n' +
+                               '  Promises are not supported in $resource, because the same value ' +
+                               'would be used for multiple requests.');
+                  }
+                  break;
               }
             });
 
diff --git a/test/ngResource/resourceSpec.js b/test/ngResource/resourceSpec.js
index 79450e4f24ea..9f9d8e4bc4a8 100644
--- a/test/ngResource/resourceSpec.js
+++ b/test/ngResource/resourceSpec.js
@@ -1355,6 +1355,46 @@ describe('resource', function() {
         /^\[\$resource:badcfg\] Error in resource configuration for action `get`\. Expected response to contain an object but got an array \(Request: GET \/Customer\/123\)/
       );
   });
+});
+
+describe('resource with promises as `timeout`', function() {
+  var httpSpy;
+  var $httpBackend;
+  var $resource;
+
+  beforeEach(module('ngResource', function($provide) {
+    $provide.decorator('$http', function($delegate) {
+      httpSpy = jasmine.createSpy('$http').andCallFake($delegate);
+      return httpSpy;
+    });
+  }));
+
+  beforeEach(inject(function(_$httpBackend_, _$resource_) {
+    $httpBackend = _$httpBackend_;
+    $resource = _$resource_;
+  }));
 
+  it('should ignore non-numeric timeouts in actions and log a $debug message',
+    inject(function($log, $q) {
+      spyOn($log, 'debug');
+      $httpBackend.whenGET('/CreditCard').respond({});
+
+      var CreditCard = $resource('/CreditCard', {}, {
+        get: {
+          method: 'GET',
+          timeout: $q.defer().promise
+        }
+      });
+
+      CreditCard.get();
+      $httpBackend.flush();
 
+      expect(httpSpy).toHaveBeenCalledOnce();
+      expect(httpSpy.calls[0].args[0].timeout).toBeUndefined();
+      expect($log.debug).toHaveBeenCalledOnceWith('ngResource:\n' +
+          '  Only numeric values are allowed as `timeout`.\n' +
+          '  Promises are not supported in $resource, because the same value ' +
+          'would be used for multiple requests.');
+    })
+  );
 });